Merge branch 'dev_issue_project' into dev

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();
                 }
             }