From d5bbd17a1428811da046ec3be3c0cc943a7ae059 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 17 六月 2026 15:13:20 +0800
Subject: [PATCH] ai数据自动生成

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

diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index ea68745..b12ee0f 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -25,6 +25,7 @@
         <result property="remark"       column="remark"       />
 		<result property="deptNames"       column="dept_names"       />
 		<result property="tenantId"       column="tenant_id"       />
+		<result property="roleNames"       column="role_names"       />
         <association property="dept"    javaType="com.ruoyi.project.system.domain.SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -290,6 +291,29 @@
 		  and su.del_flag = '0'
 		ORDER BY su.create_time DESC
 	</select>
+
+	<select id="selectUserListWithDetail" resultMap="SysUserResult">
+		select u.user_id, u.nick_name, u.user_name, u.status, u.del_flag,
+		       dept_agg.dept_names,
+		       role_agg.role_names
+		from sys_user u
+		left join (
+		    SELECT ud.user_id, GROUP_CONCAT(d.dept_name SEPARATOR ', ') AS dept_names
+		    FROM sys_user_dept ud
+		    LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
+		    WHERE d.del_flag = '0' AND d.status = '0'
+		    GROUP BY ud.user_id
+		) dept_agg on dept_agg.user_id = u.user_id
+		left join (
+		    SELECT ur.user_id, GROUP_CONCAT(r.role_name SEPARATOR ', ') AS role_names
+		    FROM sys_user_role ur
+		    LEFT JOIN sys_role r ON ur.role_id = r.role_id
+		    WHERE r.del_flag = '0' AND r.status = '0'
+		    GROUP BY ur.user_id
+		) role_agg on role_agg.user_id = u.user_id
+		where u.del_flag = '0' AND u.status = '0'
+	</select>
+
 	<select id="getUserByPerms" resultType="java.lang.Long">
 		select distinct t5.user_id
 		from sys_role_menu t1

--
Gitblit v1.9.3