Merge branch 'dev_bug_select_staff'

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;
+
 }

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;