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