From b16f79d0dca642cdc104b9ce03aa2e7428fbfab3 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Tue, 15 Feb 2022 11:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E9=97=A8=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DepartmentUserServiceImpl.java          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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<UserDTO> 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--;
+            }
         }
     }