From 4fba01c9eef863632c830ee4057703039f7b57ca Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 19 May 2020 17:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E5=99=A8Bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerAgencyServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 6137202eeb..155cafd024 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
@@ -261,8 +261,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         //部门
         Iterator<StaffListResultDTO> itDept = agencyStaffList.iterator();
         while (itDept.hasNext()) {
+            StaffListResultDTO stf = itDept.next();
             for (CustomerStaffDepartmentDTO dept : deptStaffs) {
-                if (dept.getUserId().equals(itDept.next().getStaffId())) {
+                if (dept.getUserId().equals(stf.getStaffId())) {
                     itDept.remove();
                 }
             }
@@ -270,8 +271,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         //网格
         Iterator<StaffListResultDTO> itGrid = agencyStaffList.iterator();
         while (itGrid.hasNext()) {
+            StaffListResultDTO stf = itGrid.next();
             for (CustomerStaffGridDTO grid : gridStaffs) {
-                if (grid.getUserId().equals(itGrid.next().getStaffId())) {
+                if (grid.getUserId().equals(stf.getStaffId())) {
                     itGrid.remove();
                 }
             }