From 300c35a2baf3f4e0d97d3bdde0227729b334aebc Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 25 Feb 2025 23:08:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B6=85=E7=BA=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/system/UserMapper.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml
index 0940c488..2ce46ee6 100644
--- a/src/main/resources/mapper/system/UserMapper.xml
+++ b/src/main/resources/mapper/system/UserMapper.xml
@@ -24,7 +24,9 @@
                 LEFT JOIN sys_user_role sur ON u.id = sur.user_id
                 LEFT JOIN sys_role r ON sur.role_id = r.id
         <where>
-            u.is_deleted = 0 AND u.username != 'root'
+            u.is_deleted = 0
+            <!-- 超级管理员不显示在列表 -->
+            AND r.name != '${@com.youlai.boot.common.constant.SystemConstants@ROOT_ROLE_CODE}'
             <if test='queryParams.keywords!=null and queryParams.keywords.trim() neq ""'>
                 AND (
                     u.username LIKE CONCAT('%',#{queryParams.keywords},'%')
@@ -118,9 +120,9 @@
         <result property="username" column="username" jdbcType="VARCHAR"/>
         <result property="password" column="password" jdbcType="VARCHAR"/>
         <result property="status" column="status" jdbcType="BOOLEAN"/>
-        <result property="deptId" column="dept_id" jdbcType="BIGINT"></result>
+        <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
         <collection property="roles" ofType="string" javaType="java.util.Set">
-            <result column="code"></result>
+            <result column="code" />
         </collection>
     </resultMap>
 
@@ -191,7 +193,7 @@
             sys_user u
                 LEFT JOIN sys_dept d ON u.dept_id = d.id
         <where>
-            u.is_deleted = 0 AND u.username != 'root'
+            u.is_deleted = 0
             <if test='keywords!=null and keywords.trim() neq ""'>
                 AND (u.username LIKE CONCAT('%',#{keywords},'%')
                 OR u.nickname LIKE CONCAT('%',#{keywords},'%')