From 28f9605441cdda5bd9cfabd2241ff8509a4a8888 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 20 十月 2025 18:48:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 5 ++++-
1 files changed, 4 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 cf5b704..9926cc8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -246,6 +246,9 @@
<if test="query.nickName != null and query.nickName != ''">
AND u.nick_name LIKE concat('%',#{query.nickName},'%')
</if>
+ <if test="query.roleName != null and query.roleName != ''">
+ AND r.role_name LIKE concat('%',#{query.roleName},'%')
+ </if>
<if test="query.phonenumber != null and query.phonenumber != ''">
AND u.phonenumber LIKE concat('%',#{query.phonenumber},'%')
</if>
@@ -255,7 +258,7 @@
<if test="query.roleName != null and query.roleName != ''">
AND t1.dept_name LIKE concat('%',#{query.roleName},'%')
</if>
-
+ and u.user_id!=1
ORDER BY u.create_time DESC
</select>
<select id="selectIdByPhone" resultType="java.lang.Long">
--
Gitblit v1.7.1