From 4c96637a005891c709662ae84edd072ad9a4a57d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 08 十月 2024 15:13:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 50315be..47651b2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -160,6 +160,7 @@
select
user_id AS userId,
nick_name AS nickName,
+ user_name AS userName,
create_time AS createTime,
remark AS remark
from sys_user
@@ -168,6 +169,7 @@
AND nick_name LIKE concat('%',#{query.nickName},'%')
</if>
AND del_flag = '0'
+ AND roleType = 1
</where>
ORDER BY create_time DESC
</select>
--
Gitblit v1.7.1