From a860a554680453f533328858a525e663a22e86ed Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 31 Oct 2023 10:20:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb20231030
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 0d730ba..b009485 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -1,8 +1,11 @@
package com.moral.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.entity.Organization;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.pojo.vo.user.QxUser;
+import com.moral.api.service.DeviceService;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -27,6 +30,9 @@
@Autowired
OrganizationMapper organizationMapper;
+ @Autowired
+ private DeviceService deviceService;
+
@Override
public List<Organization> getChildrenOrganizationsById(Integer id) {
@@ -36,16 +42,38 @@
}
@Override
- public Organization getStateControlStation() {
- QueryWrapper<Organization> wrapper = new QueryWrapper<>();
- wrapper.select("id");
- wrapper.eq("name","���������");
- wrapper.eq("is_delete",Constants.NOT_DELETE);
- Organization organization = organizationMapper.selectOne(wrapper);
- return organization;
+ public Organization getOrganizationById(Integer id) {
+ return organizationMapper.selectById(id);
}
/**
+ * ������������������������
+ *
+ * @return
+ */
+ @Override
+ public List<Organization> getOrganizations() {
+ QueryWrapper<Organization> wrapper = new QueryWrapper<>();
+ wrapper.select("id","name");
+ QxUser user = UserHelper.getCurrentUser();
+ Integer organizationId = user.getOrganizationId();
+ if (organizationId!=24){
+ wrapper.eq("id",user.getOrganizationId());
+ }
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<Organization> organizations = organizationMapper.selectList(wrapper);
+ for (int i=0; i<organizations.size(); i++) {
+ List<String> macs = deviceService.getMacsByOrganizationId(organizations.get(i).getId());
+ if (ObjectUtils.isEmpty(macs)){
+ organizations.remove(i);
+ i--;
+ }
+ }
+ return organizations;
+ }
+
+
+ /**
* @Description: ���������������������������������������������������children���
* @Param: [parentId, children]
* @return: void
--
Gitblit v1.8.0