From 35fdcf14f69d5c3d3fea2e99d32535f7e755d30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=BD=AC?=
 <14779346+xswl_123@user.noreply.gitee.com>
Date: Wed, 30 Jul 2025 11:15:41 +0800
Subject: [PATCH] =?UTF-8?q?7-29=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84Mapper=E5=B1=82=E6=9F=A5=E8=AF=A2SQL?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E5=92=8C=E8=A7=92=E8=89=B2=E7=9A=84=E9=87=8D=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../znpt/service/impl/UserServiceImpl.java    |  3 ++
 core/src/main/resources/mapper/UserMapper.xml | 43 +++++++++++++------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java
index 92d5a27..eee4f69 100644
--- a/core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java
+++ b/core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java
@@ -197,6 +197,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
         if(CollUtil.isNotEmpty(req.getPostIds())){
             userPostService.bindUserPost(userId, req.getPostIds());
         }
+        if(CollUtil.isNotEmpty(req.getRoleIds())){
+            userRoleService.bindUserRole(new UserRoleReq().setUserId(userId).setRoleIds(req.getRoleIds()));
+        }
         this.updateById(entity);
     }
 
diff --git a/core/src/main/resources/mapper/UserMapper.xml b/core/src/main/resources/mapper/UserMapper.xml
index d61f50d..abec525 100644
--- a/core/src/main/resources/mapper/UserMapper.xml
+++ b/core/src/main/resources/mapper/UserMapper.xml
@@ -8,38 +8,55 @@
     </sql>
 
     <select id="queryBySelective" resultType="com.dite.znpt.domain.vo.UserListResp">
-        SELECT u.user_id, u.account, u.status, u.name, u.user_code, u.user_type, u.user_status, d.dept_name, u.mobile, u.create_time,
-               GROUP_CONCAT(r.role_name) AS role_name,GROUP_CONCAT(p.post_name) AS post_name
+        SELECT
+        u.user_id,
+        u.account,
+        u.status,
+        u.name,
+        u.user_code,
+        u.user_type,
+        u.user_status,
+        d.dept_name,
+        u.mobile,
+        u.create_time,
+        (
+        SELECT GROUP_CONCAT(DISTINCT r.role_name)
+        FROM user_role ur
+        JOIN role r ON ur.role_id = r.role_id
+        WHERE ur.user_id = u.user_id
+        ) AS role_name,
+        (
+        SELECT GROUP_CONCAT(DISTINCT p.post_name)
+        FROM user_post up
+        JOIN post p ON up.post_id = p.post_id
+        WHERE up.user_id = u.user_id
+        ) AS post_name
         FROM user u
         LEFT JOIN dept d ON u.dept_id = d.dept_id
-        LEFT JOIN user_role ur ON u.user_id = ur.user_id
-        LEFT JOIN role r ON ur.role_id = r.role_id
-        LEFT JOIN user_post up ON up.user_id = u.user_id
-        LEFT JOIN post p ON p.post_id = up.post_id
         <where>
             <if test="userCode != null and userCode != ''">
-                AND u.user_code LIKE concat ('%', #{userCode}, '%')
+                AND u.user_code LIKE CONCAT('%', #{userCode}, '%')
             </if>
             <if test="account != null and account != ''">
-                AND u.account LIKE concat ('%', #{account}, '%')
+                AND u.account LIKE CONCAT('%', #{account}, '%')
             </if>
             <if test="name != null and name != ''">
-                AND u.name LIKE concat ('%', #{name}, '%')
+                AND u.name LIKE CONCAT('%', #{name}, '%')
             </if>
             <if test="mobile != null and mobile != ''">
-                AND u.mobile LIKE concat ('%', #{mobile}, '%')
+                AND u.mobile LIKE CONCAT('%', #{mobile}, '%')
             </if>
             <if test="deptId != null and deptId != ''">
                 AND d.dept_id = #{deptId}
             </if>
-            <if test="userStatus != null and userStatus!=''">
+            <if test="userStatus != null and userStatus != ''">
                 AND u.user_status = #{userStatus}
             </if>
-            <if test="userType != null and userType!=''">
+            <if test="userType != null and userType != ''">
                 AND u.user_Type = #{userType}
             </if>
         </where>
-        GROUP BY u.user_id, u.account, u.status, u.name, u.user_code, u.user_type, u.user_status, d.dept_name, u.mobile, u.create_time
+        <!-- 移除了 GROUP BY -->
     </select>
 </mapper>