diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java index b3e8009d..ffc5e629 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java @@ -383,13 +383,20 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe userIdSet.add(hasDepartmentUserId.getUserId()); } List userDTOs = userBaseService.listByUserIds(new ArrayList<>(userIdSet)); - for (DepartmentUserDTO departmentUserDTO : departmentUserDTOs) { + for (int i = 0; i < departmentUserDTOs.size(); i++) { + DepartmentUserDTO departmentUserDTO = departmentUserDTOs.get(i); + boolean isExist = false; for (UserDTO userDTO : userDTOs) { if (StringUtils.equals(departmentUserDTO.getUserId(), userDTO.getUserId())) { departmentUserDTO.setUser(userDTO); + isExist = true; break; } } + if (!isExist) { + departmentUserDTOs.remove(i); + i--; + } } }