From 9c44236ba81e1f5d9cb50251da8fdc883192e612 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 18:46:44 +0800
Subject: [PATCH] 修改只看我功能

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 755d0cc..ce30170 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -27,6 +27,7 @@
         <result property="signatureUrl"       column="signature_url"       />
         <result property="pictureUrl"       column="picture_url"       />
         <result property="company"       column="company"       />
+        <result property="roleName"       column="role_name"       />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -61,8 +62,28 @@
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.id, u.dept_id, u.name, u.account, u.email, u.picture_url, u.phone, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from user u
+		select u.id,
+		u.dept_id,
+		u.name,
+		u.account,
+		u.email,
+		u.picture_url,
+		u.phone,
+		u.sex,
+		u.status,
+		u.del_flag,
+		u.login_ip,
+		u.login_date,
+		u.create_by,
+		u.create_time,
+		u.remark,
+		d.dept_name,
+		d.leader,
+		GROUP_CONCAT(DISTINCT sr.role_name SEPARATOR ',') AS role_name
+		from user u
 		left join sys_dept d on u.dept_id = d.dept_id
+		left join sys_user_role sur on sur.user_id = u.id
+		left join sys_role sr on sr.role_id = sur.role_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.id = #{userId}
@@ -88,6 +109,7 @@
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
+		group by u.id
 		<!-- 鏁版嵁鑼冨洿杩囨护 -->
 		${params.dataScope}
 	</select>

--
Gitblit v1.9.3