Merge remote-tracking branch 'origin/dev_issue_project' into dev

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<CustomerAgencyDao
         List<StaffListResultDTO> staffList = dto.getStaffList();
         List<CustomerStaffRoleResultDTO> roleList = dto.getRoleList();
         //有时间再优化成jdk8的遍历方式
+        //5.0:先把在部门或网格下存在的人员在组织中去掉，组织中只展示在部门、网格下不存在的人员
+        //部门
+        Iterator<StaffListResultDTO> itDept = agencyStaffList.iterator();
+        while (itDept.hasNext()) {
+            for (CustomerStaffDepartmentDTO dept : deptStaffs) {
+                if (dept.getUserId().equals(itDept.next().getStaffId())) {
+                    itDept.remove();
+                }
+            }
+        }
+        //网格
+        Iterator<StaffListResultDTO> 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){
             //人员信息