From 7671d3be28e816ea395cf06772e8ce3de3397b58 Mon Sep 17 00:00:00 2001
From: TS-QD1 <tskj_pc1@163.com>
Date: Wed, 17 May 2023 10:44:19 +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

---
 .../mybatis/mapper/department-user-mapper.xml | 26 +++++++++++------
 .../service/group/dao/IGroupUserDao.java      |  3 ++
 .../group/service/IGroupUserService.java      |  2 ++
 .../service/impl/GroupUserServiceImpl.java    |  7 +++++
 .../mybatis/mapper/group-user-mapper.xml      | 28 ++++++++++++++++++-
 .../position/dao/IPositionUserDao.java        |  3 ++
 .../service/IPositionUserService.java         |  3 ++
 .../service/impl/PositionUserServiceImpl.java |  7 +++++
 .../mybatis/mapper/position-user-mapper.xml   | 28 ++++++++++++++++++-
 .../wgink/service/role/dao/IRoleUserDao.java  |  3 ++
 .../role/service/IRoleUserService.java        |  7 +++++
 .../service/impl/RoleUserServiceImpl.java     | 10 +++++++
 .../mybatis/mapper/role-user-mapper.xml       | 25 +++++++++++++++--
 13 files changed, 139 insertions(+), 13 deletions(-)

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 @@
 
     <resultMap id="departmentUserDTO" type="ink.wgink.pojo.dtos.department.DepartmentUserDTO">
         <result column="department_id" property="departmentId"/>
+        <result column="department_name" property="departmentName"/>
         <result column="user_id" property="userId"/>
         <result column="user_sort" property="userSort"/>
         <result column="user_username" property="userUsername"/>
@@ -84,25 +85,32 @@
     <!-- 机构用户列表 -->
     <select id="list" parameterType="map" resultMap="departmentUserDTO">
         SELECT
-            department_id,
-            user_id,
-            user_sort
+            t1.department_id,
+            st1.department_name,
+            t1.user_id,
+            t1.user_sort
         FROM
-            sys_department_user
+            sys_department_user t1
+        INNER JOIN
+            sys_department st1
+        ON
+            t1.department_id = st1.department_id
         <where>
+            st1.is_delete = 0
             <if test="departmentId != null and departmentId != ''">
-                department_id = #{departmentId}
+            AND
+                st1.department_id = #{departmentId}
             </if>
             <if test="departmentIds != null and departmentIds.size > 0">
             AND
-                department_id IN
+                st1.department_id IN
                 <foreach collection="departmentIds" index="index" open="(" separator="," close=")">
                     #{departmentIds[${index}]}
                 </foreach>
             </if>
             <if test="userIds != null and userIds.size > 0">
             AND
-                user_id IN
+                t1.user_id IN
                 <foreach collection="userIds" index="index" open="(" separator="," close=")">
                     #{userIds[${index}]}
                 </foreach>
@@ -112,12 +120,12 @@
         ORDER BY
             <trim suffixOverrides=",">
                 <if test="order == 'userSort'">
-                    user_sort <if test="sort != null and sort != ''"><if test="sort == 'asc'">ASC</if><if test="sort == 'desc'">DESC</if></if>,
+                    t1.user_sort <if test="sort != null and sort != ''"><if test="sort == 'asc'">ASC</if><if test="sort == 'desc'">DESC</if></if>,
                 </if>
             </trim>
             <trim suffixOverrides=",">
                 <if test="order == 'userSort'">
-                    user_sort <if test="sort != null and sort != ''"><if test="sort == 'asc'">ASC</if><if test="sort == 'desc'">DESC</if></if>,
+                    t1.user_sort <if test="sort != null and sort != ''"><if test="sort == 'asc'">ASC</if><if test="sort == 'desc'">DESC</if></if>,
                 </if>
             </trim>
         </if>
diff --git a/service-group/src/main/java/ink/wgink/service/group/dao/IGroupUserDao.java b/service-group/src/main/java/ink/wgink/service/group/dao/IGroupUserDao.java
index d9296bd7..7973d11b 100644
--- a/service-group/src/main/java/ink/wgink/service/group/dao/IGroupUserDao.java
+++ b/service-group/src/main/java/ink/wgink/service/group/dao/IGroupUserDao.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.group.GroupUserDTO;
 import ink.wgink.pojo.dtos.user.UserDTO;
 import ink.wgink.pojo.pos.GroupPO;
 import org.springframework.stereotype.Repository;
@@ -84,4 +85,6 @@ public interface IGroupUserDao extends IInitBaseTable {
      * @throws SearchException
      */
     List<GroupPO> listGroupPO(Map<String, Object> params) throws SearchException;
+
+    List<GroupUserDTO> list(Map<String, Object> params);
 }
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 df18b848..3465772e 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
@@ -2,6 +2,7 @@ package ink.wgink.service.group.service;
 
 import ink.wgink.interfaces.group.IGroupUserBaseService;
 import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.dtos.group.GroupUserDTO;
 import ink.wgink.pojo.dtos.user.UserDTO;
 import ink.wgink.pojo.pos.GroupPO;
 import ink.wgink.pojo.result.SuccessResultList;
@@ -99,4 +100,5 @@ public interface IGroupUserService extends IGroupUserBaseService {
      */
     SuccessResultList<List<UserDTO>> listPageUser(ListPage page);
 
+    List<GroupUserDTO> listByUserIds(List<String> userIds);
 }
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 253d6362..9a33070c 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
@@ -160,6 +160,13 @@ public class GroupUserServiceImpl extends DefaultBaseService implements IGroupUs
         return new SuccessResultList<>(userDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
     }
 
+    @Override
+    public List<GroupUserDTO> listByUserIds(List<String> userIds) {
+        Map<String,Object> params = getHashMap(2);
+        params.put("userIds", userIds);
+        return groupUserDao.list(params);
+    }
+
     @Override
     public List<String> listUserId(String groupId) {
         Map<String, Object> params = getHashMap(2);
diff --git a/service-group/src/main/resources/mybatis/mapper/group-user-mapper.xml b/service-group/src/main/resources/mybatis/mapper/group-user-mapper.xml
index ffc72c71..dfc2e8e1 100644
--- a/service-group/src/main/resources/mybatis/mapper/group-user-mapper.xml
+++ b/service-group/src/main/resources/mybatis/mapper/group-user-mapper.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="ink.wgink.service.group.dao.IGroupUserDao">
 
-
+    <resultMap id="groupUserDTO" type="ink.wgink.pojo.dtos.group.GroupUserDTO">
+        <result column="group_id" property="groupId"/>
+        <result column="group_name" property="groupName"/>
+        <result column="user_id" property="userId"/>
+    </resultMap>
 
     <!-- 建表 -->
     <update id="createTable">
@@ -223,5 +227,27 @@
                 </where>
             )
     </select>
+
+    <select id="list" parameterType="map" resultMap="groupUserDTO">
+        SELECT
+            t1.group_id,
+            st1.group_name,
+            t1.user_id
+        FROM
+            sys_group_user t1
+        INNER JOIN
+            sys_group st1
+        ON
+            t1.group_id = st1.group_id
+        WHERE
+            st1.is_delete = 0
+            <if test="userIds != null and userIds.size > 0">
+                AND
+                t1.user_id IN
+                <foreach collection="userIds" index="index" open="(" separator="," close=")">
+                    #{userIds[${index}]}
+                </foreach>
+            </if>
+    </select>
     
 </mapper>
\ 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<PositionPO> listPositionPO(Map<String, Object> params) throws SearchException;
+
+    List<PositionUserDTO> list(Map<String, Object> 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<List<UserDTO>> listPageUser(ListPage page);
 
+    List<PositionUserDTO> listByUserIds(List<String> 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<PositionUserDTO> listByUserIds(List<String> userIds) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("userIds", userIds);
+        return positionUserDao.list(params);
+    }
+
     @Override
     public List<String> listUserId(String positionId) {
         Map<String, Object> 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 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="ink.wgink.service.position.dao.IPositionUserDao">
 
-
+    <resultMap id="positionUserDTO" type="ink.wgink.pojo.dtos.position.PositionUserDTO">
+        <result column="position_id" property="positionId"/>
+        <result column="position_name" property="positionName"/>
+        <result column="user_id" property="userId"/>
+    </resultMap>
 
     <!-- 建表 -->
     <update id="createTable">
@@ -233,4 +237,26 @@
             )
     </select>
 
+    <select id="list" parameterType="map" resultMap="positionUserDTO">
+        SELECT
+            t1.position_id,
+            st1.position_name,
+            t1.user_id
+        FROM
+            sys_position_user t1
+        INNER JOIN
+            sys_position st1
+        ON
+            t1.position_id = st1.position_id
+        WHERE
+            st1.is_delete = 0
+        <if test="userIds != null and userIds.size > 0">
+            AND
+                t1.user_id IN
+            <foreach collection="userIds" index="index" open="(" separator="," close=")">
+                #{userIds[${index}]}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>
\ 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<RolePO> listRolePO(Map<String, Object> params) throws SearchException;
+
+    List<RoleUserDTO> list(Map<String, Object> 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<UserPO> listUserPOByRoleIds(List<String> roleIds);
 
+    /**
+     *
+     * @param userIds
+     * @return
+     */
+    List<RoleUserDTO> listByUserIds(List<String> 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<RoleUserDTO> listByUserIds(List<String> userIds) {
+        if (userIds.isEmpty()) {
+            return new ArrayList<>();
+        }
+        Map<String, Object> 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 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="ink.wgink.service.role.dao.IRoleUserDao">
 
-
-
     <resultMap id="roleUserDTO" type="ink.wgink.pojo.dtos.role.RoleUserDTO" extends="ink.wgink.service.user.dao.IUserDao.userDTO">
         <result column="role_id" property="roleId"/>
+        <result column="role_name" property="roleName"/>
         <result column="user_id" property="userId"/>
     </resultMap>
 
@@ -513,4 +512,26 @@
             )
     </select>
 
+    <select id="list" parameterType="map" resultMap="roleUserDTO">
+        SELECT
+            t1.role_id,
+            st1.role_name,
+            t1.user_id
+        FROM
+            sys_role_user t1
+        INNER JOIN
+            sys_role st1
+        ON
+            t1.role_id = st1.role_id
+        WHERE
+            st1.is_delete = 0
+            <if test="userIds != null and userIds.size > 0">
+                AND
+                t1.user_id IN
+                <foreach collection="userIds" index="index" open="(" separator="," close=")">
+                    #{userIds[${index}]}
+                </foreach>
+            </if>
+    </select>
+
 </mapper>
\ No newline at end of file