From 88638d6fa84114381fe4b8f8dadc2162f3eb4b98 Mon Sep 17 00:00:00 2001
From: WenG <450292408@qq.com>
Date: Fri, 18 Jun 2021 13:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B2=A1=E6=9C=89=E8=87=AA?=
 =?UTF-8?q?=E7=94=B1=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E7=A9=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DepartmentUserServiceImpl.java       | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

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 818c6f2e..758e48aa 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
@@ -5,9 +5,9 @@ import ink.wgink.exceptions.SearchException;
 import ink.wgink.interfaces.consts.ISystemConstant;
 import ink.wgink.interfaces.user.IUserBaseService;
 import ink.wgink.pojo.ListPage;
-import ink.wgink.pojo.pos.DepartmentPO;
 import ink.wgink.pojo.dtos.department.DepartmentUserDTO;
 import ink.wgink.pojo.dtos.user.UserDTO;
+import ink.wgink.pojo.pos.DepartmentPO;
 import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.service.department.dao.IDepartmentUserDao;
 import ink.wgink.service.department.pojo.vos.DepartmentUserSortVO;
@@ -19,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -203,15 +202,12 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
      */
     private SuccessResultList<List<DepartmentUserDTO>> listPageUserByExcludeDepartment(ListPage page) {
         List<DepartmentUserDTO> hasDepartmentUsers = list(getHashMap(0));
-        if (hasDepartmentUsers.isEmpty()) {
-            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
-        }
         List<String> userIds = new ArrayList<>();
         for (DepartmentUserDTO hasDepartmentUserId : hasDepartmentUsers) {
             userIds.add(hasDepartmentUserId.getUserId());
         }
         SuccessResultList<List<UserDTO>> successResultList = userBaseService.listPageByExcludeIds(userIds, page);
-        return listPageDepartmentUser(successResultList, hasDepartmentUsers, page);
+        return listPageExcludeDepartmentUser(successResultList);
     }
 
     /**
@@ -231,18 +227,36 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
             userIds.add(hasDepartmentUserId.getUserId());
         }
         SuccessResultList<List<UserDTO>> successResultList = userBaseService.listPageByIds(userIds, page);
-        return listPageDepartmentUser(successResultList, hasDepartmentUsers, page);
+        return listPageDepartmentUser(successResultList, hasDepartmentUsers);
     }
 
     /**
      * 机构用户分页列表
      *
-     * @param userIds
-     * @param hasDepartmentUsers
-     * @param page
+     * @param successResultList
      * @return
      */
-    private SuccessResultList<List<DepartmentUserDTO>> listPageDepartmentUser(SuccessResultList<List<UserDTO>> successResultList, List<DepartmentUserDTO> hasDepartmentUsers, ListPage page) {
+    private SuccessResultList<List<DepartmentUserDTO>> listPageExcludeDepartmentUser(SuccessResultList<List<UserDTO>> successResultList) {
+        // 查询用户排序
+        List<UserDTO> userDTOs = successResultList.getRows();
+        List<DepartmentUserDTO> departmentUserDTOs = new ArrayList<>();
+        for (UserDTO userDTO : userDTOs) {
+            DepartmentUserDTO departmentUserDTO = new DepartmentUserDTO(userDTO);
+            departmentUserDTO.setDepartmentId("");
+            departmentUserDTO.setUserSort("ZZZ-000");
+            departmentUserDTOs.add(departmentUserDTO);
+        }
+        return new SuccessResultList<>(departmentUserDTOs, successResultList.getPage(), successResultList.getTotal());
+    }
+
+    /**
+     * 机构用户分页列表
+     *
+     * @param successResultList
+     * @param hasDepartmentUsers
+     * @return
+     */
+    private SuccessResultList<List<DepartmentUserDTO>> listPageDepartmentUser(SuccessResultList<List<UserDTO>> successResultList, List<DepartmentUserDTO> hasDepartmentUsers) {
         // 查询用户排序
         List<UserDTO> userDTOs = successResultList.getRows();
         List<DepartmentUserDTO> departmentUserDTOs = new ArrayList<>();