diff --git a/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml index 508d34f2..39df7e1c 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml @@ -4,6 +4,7 @@ + @@ -84,25 +85,32 @@ + + \ No newline at end of file diff --git a/service-position/src/main/java/ink/wgink/service/position/dao/IPositionUserDao.java b/service-position/src/main/java/ink/wgink/service/position/dao/IPositionUserDao.java index 2612baae..2a7fadca 100644 --- a/service-position/src/main/java/ink/wgink/service/position/dao/IPositionUserDao.java +++ b/service-position/src/main/java/ink/wgink/service/position/dao/IPositionUserDao.java @@ -4,6 +4,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.init.IInitBaseTable; +import ink.wgink.pojo.dtos.position.PositionUserDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.pos.PositionPO; import org.springframework.stereotype.Repository; @@ -84,4 +85,6 @@ public interface IPositionUserDao extends IInitBaseTable { * @throws SearchException */ List listPositionPO(Map params) throws SearchException; + + List list(Map params); } diff --git a/service-position/src/main/java/ink/wgink/service/position/service/IPositionUserService.java b/service-position/src/main/java/ink/wgink/service/position/service/IPositionUserService.java index a23e5e6b..0fd6e81e 100644 --- a/service-position/src/main/java/ink/wgink/service/position/service/IPositionUserService.java +++ b/service-position/src/main/java/ink/wgink/service/position/service/IPositionUserService.java @@ -2,6 +2,7 @@ package ink.wgink.service.position.service; import ink.wgink.interfaces.position.IPositionUserBaseService; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.dtos.position.PositionUserDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; @@ -96,4 +97,6 @@ public interface IPositionUserService extends IPositionUserBaseService { */ SuccessResultList> listPageUser(ListPage page); + List listByUserIds(List userIds); + } 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 c636d838..2069ea00 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 @@ -164,6 +164,13 @@ public class PositionUserServiceImpl extends DefaultBaseService implements IPosi return new SuccessResultList<>(userDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + public List listByUserIds(List userIds) { + Map params = getHashMap(2); + params.put("userIds", userIds); + return positionUserDao.list(params); + } + @Override public List listUserId(String positionId) { Map params = getHashMap(2); 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 b76f91d6..255a139b 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 @@ -2,7 +2,11 @@ - + + + + + @@ -233,4 +237,26 @@ ) + + \ No newline at end of file diff --git a/service-role/src/main/java/ink/wgink/service/role/dao/IRoleUserDao.java b/service-role/src/main/java/ink/wgink/service/role/dao/IRoleUserDao.java index 20a12d43..2060d2b0 100644 --- a/service-role/src/main/java/ink/wgink/service/role/dao/IRoleUserDao.java +++ b/service-role/src/main/java/ink/wgink/service/role/dao/IRoleUserDao.java @@ -5,6 +5,7 @@ import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.init.IInitBaseTable; import ink.wgink.pojo.dtos.department.DepartmentUserDTO; +import ink.wgink.pojo.dtos.role.RoleUserDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.pos.RolePO; import ink.wgink.service.user.pojo.pos.UserPO; @@ -104,4 +105,6 @@ public interface IRoleUserDao extends IInitBaseTable { * @throws SearchException */ List listRolePO(Map params) throws SearchException; + + List list(Map params); } 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 2f4e8e89..ea958f28 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 @@ -3,6 +3,7 @@ package ink.wgink.service.role.service; import ink.wgink.interfaces.role.IRoleUserBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.department.DepartmentUserDTO; +import ink.wgink.pojo.dtos.role.RoleUserDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.pos.RolePO; import ink.wgink.pojo.result.SuccessResultList; @@ -141,4 +142,10 @@ public interface IRoleUserService extends IRoleUserBaseService { */ List listUserPOByRoleIds(List roleIds); + /** + * + * @param userIds + * @return + */ + List listByUserIds(List userIds); } 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 8258c731..8382b0f9 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 @@ -344,6 +344,16 @@ public class RoleUserServiceImpl extends DefaultBaseService implements IRoleUser return listUserPO(params); } + @Override + public List listByUserIds(List userIds) { + if (userIds.isEmpty()) { + return new ArrayList<>(); + } + Map params = getHashMap(2); + params.put("userIds", userIds); + return roleUserDao.list(params); + } + /** * 更新mongo * diff --git a/service-role/src/main/resources/mybatis/mapper/role-user-mapper.xml b/service-role/src/main/resources/mybatis/mapper/role-user-mapper.xml index ee8d0c54..d3d81ec1 100644 --- a/service-role/src/main/resources/mybatis/mapper/role-user-mapper.xml +++ b/service-role/src/main/resources/mybatis/mapper/role-user-mapper.xml @@ -2,10 +2,9 @@ - - + @@ -513,4 +512,26 @@ ) + + \ No newline at end of file