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> listPageUserByExcludeDepartment(ListPage page) { List hasDepartmentUsers = list(getHashMap(0)); - if (hasDepartmentUsers.isEmpty()) { - return new SuccessResultList<>(new ArrayList<>(), 1, 0L); - } List userIds = new ArrayList<>(); for (DepartmentUserDTO hasDepartmentUserId : hasDepartmentUsers) { userIds.add(hasDepartmentUserId.getUserId()); } SuccessResultList> 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> 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> listPageDepartmentUser(SuccessResultList> successResultList, List hasDepartmentUsers, ListPage page) { + private SuccessResultList> listPageExcludeDepartmentUser(SuccessResultList> successResultList) { + // 查询用户排序 + List userDTOs = successResultList.getRows(); + List 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> listPageDepartmentUser(SuccessResultList> successResultList, List hasDepartmentUsers) { // 查询用户排序 List userDTOs = successResultList.getRows(); List departmentUserDTOs = new ArrayList<>();