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 fe339b23bb..6137202eeb 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 @@ -257,6 +257,25 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl staffList = dto.getStaffList(); List roleList = dto.getRoleList(); //有时间再优化成jdk8的遍历方式 + //5.0:先把在部门或网格下存在的人员在组织中去掉,组织中只展示在部门、网格下不存在的人员 + //部门 + Iterator itDept = agencyStaffList.iterator(); + while (itDept.hasNext()) { + for (CustomerStaffDepartmentDTO dept : deptStaffs) { + if (dept.getUserId().equals(itDept.next().getStaffId())) { + itDept.remove(); + } + } + } + //网格 + Iterator itGrid = agencyStaffList.iterator(); + while (itGrid.hasNext()) { + for (CustomerStaffGridDTO grid : gridStaffs) { + if (grid.getUserId().equals(itGrid.next().getStaffId())) { + itGrid.remove(); + } + } + } //5.1装载组织下人员数据 for(StaffListResultDTO sf : agencyStaffList){ //人员信息