From 648a7d7d87155987c2711d1c6b60ec7addf2e7fa Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 19 May 2020 16:39:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=B0=83=E6=95=B4=E5=BC=95?= =?UTF-8?q?=E8=B5=B7=E7=9A=84=E4=BB=A3=E7=A0=81=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerAgencyServiceImpl.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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){ //人员信息