From 06ce0211b7d238660157c86204cb319f09fce7b8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 5 Aug 2022 17:24:04 +0800
Subject: [PATCH] emm

---
 .../main/java/com/epmet/dto/result/StaffListResultDTO.java    | 2 ++
 .../com/epmet/service/impl/CustomerAgencyServiceImpl.java     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java
index 2bf18307ce..c5e0fafb4e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java
@@ -41,4 +41,6 @@ public class StaffListResultDTO implements Serializable {
 	 */
 	private String mobile="";
 
+	private Boolean staffEnabledStatus = false;
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 4354be6b51..f2c0392dc7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -325,6 +325,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                     sf.setStaffName(stf.getStaffName());
                     sf.setStaffHeadPhoto(stf.getStaffHeadPhoto());
                     sf.setGender(stf.getGender());
+                    sf.setStaffEnabledStatus(true);
                 }
             });
             //人员角色信息
@@ -374,7 +375,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 });
             });
         });
-        resultDTO.setAgencyStaffList(agencyStaffList);
+        Map<Boolean, List<StaffListResultDTO>> collect = agencyStaffList.stream().collect(Collectors.groupingBy(StaffListResultDTO::getStaffEnabledStatus));
+        resultDTO.setAgencyStaffList(CollectionUtils.isNotEmpty(collect.get(true)) ? collect.get(true) : new ArrayList<>());
         resultDTO.setDepartmentList(departmentList);
         resultDTO.setGridList(gridList);
         return resultDTO;