From 6e228993972593842cb1cb51b2396675b9658ae5 Mon Sep 17 00:00:00 2001 From: TS-QD1 Date: Tue, 16 May 2023 17:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wgink/interfaces/group/IGroupUserBaseService.java | 9 +++++++++ .../ink/wgink/interfaces/role/IRoleUserBaseService.java | 3 +++ .../department/service/IDepartmentUserService.java | 3 +++ .../service/impl/DepartmentUserServiceImpl.java | 7 +++++++ .../wgink/service/group/service/IGroupUserService.java | 1 + .../service/group/service/impl/GroupUserServiceImpl.java | 7 +++++++ .../position/service/impl/PositionUserServiceImpl.java | 6 +----- .../resources/mybatis/mapper/position-user-mapper.xml | 3 +-- .../ink/wgink/service/role/service/IRoleUserService.java | 1 + .../service/role/service/impl/RoleUserServiceImpl.java | 7 +++++++ 10 files changed, 40 insertions(+), 7 deletions(-) diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/group/IGroupUserBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/group/IGroupUserBaseService.java index 5cf5937c..817cf5ca 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/group/IGroupUserBaseService.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/group/IGroupUserBaseService.java @@ -53,6 +53,15 @@ public interface IGroupUserBaseService { */ List listGroupPOByUserId(String userId); + /** + * 组列表 + * + * @param userIds + * @return + */ + List listGroupPOByUserIds(List userIds); + + /** * 组列表（简单） * diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleUserBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleUserBaseService.java index ba164635..5ff8cb05 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleUserBaseService.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleUserBaseService.java @@ -55,6 +55,9 @@ public interface IRoleUserBaseService { */ List listRolePOByUserId(String userId); + List listRolePOByUserIds(List userIds); + + /** * 角色列表 * diff --git a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java index 88583024..0c4b7723 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java @@ -122,6 +122,9 @@ public interface IDepartmentUserService extends IDepartmentUserBaseService { */ List listDepartmentPOByUserId(String userId); + List listDepartmentPOByUserIds(List userIds); + + /** * 部门列表（简单） * 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 201de80e..7043f7bb 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 @@ -206,6 +206,13 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe return departmentUserDao.listDepartmentPO(params); } + @Override + public List listDepartmentPOByUserIds(List userIds) { + Map params = getHashMap(2); + params.put("userIds", userIds); + return departmentUserDao.listDepartmentPO(params); + } + @Override public List listSimple(List departmentPOs) { if (departmentPOs == null || departmentPOs.isEmpty()) { diff --git a/service-group/src/main/java/ink/wgink/service/group/service/IGroupUserService.java b/service-group/src/main/java/ink/wgink/service/group/service/IGroupUserService.java index 96d64cf3..df18b848 100644 --- a/service-group/src/main/java/ink/wgink/service/group/service/IGroupUserService.java +++ b/service-group/src/main/java/ink/wgink/service/group/service/IGroupUserService.java @@ -3,6 +3,7 @@ package ink.wgink.service.group.service; import ink.wgink.interfaces.group.IGroupUserBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.user.UserDTO; +import ink.wgink.pojo.pos.GroupPO; import ink.wgink.pojo.result.SuccessResultList; import java.util.List; diff --git a/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupUserServiceImpl.java b/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupUserServiceImpl.java index a958121f..253d6362 100644 --- a/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupUserServiceImpl.java +++ b/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupUserServiceImpl.java @@ -198,6 +198,13 @@ public class GroupUserServiceImpl extends DefaultBaseService implements IGroupUs return groupUserDao.listGroupPO(params); } + @Override + public List listGroupPOByUserIds(List userIds) { + Map params = getHashMap(2); + params.put("userIds", userIds); + return groupUserDao.listGroupPO(params); + } + @Override public List listSimple(List groupPOs) { if (groupPOs == null || groupPOs.isEmpty()) { diff --git a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java index c13c3649..c636d838 100644 --- a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java +++ b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java @@ -236,11 +236,7 @@ public class PositionUserServiceImpl extends DefaultBaseService implements IPosi public List listPositionPOByUserIds(List userIds) { Map params = getHashMap(2); params.put("userIds", userIds); - List positionIds = positionUserDao.listPositionId(params); - if (positionIds.isEmpty()) { - return new ArrayList<>(); - } - return positionService.listPO(positionIds); + return positionUserDao.listPositionPO(params); } @Override diff --git a/service-position/src/main/resources/mybatis/mapper/position-user-mapper.xml b/service-position/src/main/resources/mybatis/mapper/position-user-mapper.xml index da9a35e7..b76f91d6 100644 --- a/service-position/src/main/resources/mybatis/mapper/position-user-mapper.xml +++ b/service-position/src/main/resources/mybatis/mapper/position-user-mapper.xml @@ -101,11 +101,10 @@ user_id = #{userId} - user_id IN ( + user_id IN #{userIds[${index}]} - ) diff --git a/service-role/src/main/java/ink/wgink/service/role/service/IRoleUserService.java b/service-role/src/main/java/ink/wgink/service/role/service/IRoleUserService.java index dfc29248..2f4e8e89 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/IRoleUserService.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/IRoleUserService.java @@ -4,6 +4,7 @@ import ink.wgink.interfaces.role.IRoleUserBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.department.DepartmentUserDTO; import ink.wgink.pojo.dtos.user.UserDTO; +import ink.wgink.pojo.pos.RolePO; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.service.user.pojo.pos.UserPO; diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java index 12dd22bf..e613d39b 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java @@ -226,6 +226,13 @@ public class RoleUserServiceImpl extends DefaultBaseService implements IRoleUser return roleUserDao.listRolePO(params); } + @Override + public List listRolePOByUserIds(List userIds) { + Map params = getHashMap(2); + params.put("userIds", userIds); + return roleUserDao.listRolePO(params); + } + @Override public List listRolePOByRoleIds(List roleIds) { if (roleIds.isEmpty()) {