From 450b4bc51e7df7621155dc0c5592a6d11a935551 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 18 六月 2026 09:49:53 +0800
Subject: [PATCH] 排版显示存在的员工数据
---
src/main/resources/mapper/system/SysUserMapper.xml | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index 72da1a1..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>
@@ -97,6 +98,7 @@
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
+ ORDER BY u.create_time DESC
</select>
<select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
@@ -130,17 +132,20 @@
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
+ ORDER BY u.create_time DESC
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_name = #{userName} and u.del_flag = '0'
+ ORDER BY u.create_time DESC
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
and u.del_flag = '0'
+ ORDER BY u.create_time DESC
</select>
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -165,6 +170,7 @@
</if>
and u.del_flag = '0'
</where>
+ ORDER BY u.create_time DESC
</select>
<select id="selectRegistrantIds" resultType="com.ruoyi.project.system.domain.SysUser">
SELECT user_id, nick_name FROM sys_user
@@ -179,6 +185,7 @@
1=0 <!-- 绌哄垪琛ㄦ椂杩斿洖绌虹粨鏋� -->
</if>
</where>
+ ORDER BY sys_user.create_time DESC
</select>
<select id="selectUsersByIds" resultType="com.ruoyi.project.system.domain.SysUser">
SELECT user_id, nick_name
@@ -188,6 +195,7 @@
#{id}
</foreach>
and del_flag = '0'
+ ORDER BY sys_user.create_time DESC
</select>
<select id="selectUserByNickName" resultType="com.ruoyi.project.system.domain.SysUser"
parameterType="java.lang.String">
@@ -281,7 +289,31 @@
and sr.status = '0'
and su.status = '0'
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