From 49d7ce5a988596d7540083be0e1948bcb66af544 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:12:03 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 6458feb..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
@@ -5,6 +5,7 @@
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;
@@ -28,6 +29,9 @@
@Autowired
OrganizationMapper organizationMapper;
+
+ @Autowired
+ private DeviceService deviceService;
@Override
@@ -58,6 +62,13 @@
}
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;
}
--
Gitblit v1.8.0