From be4bfd2dac75cf4249ef30f85c4fbb07d0dcc67f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 24 十月 2023 18:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/resources/mappers/SystemUserMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/resources/mappers/SystemUserMapper.xml b/server/services/src/main/resources/mappers/SystemUserMapper.xml
index 4e3503d..9ae4ea2 100644
--- a/server/services/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/services/src/main/resources/mappers/SystemUserMapper.xml
@@ -63,12 +63,13 @@
select
distinct
usr.id, usr.birthday, usr.email, usr.emp_no, usr.mobile, usr.avatar, usr.username, usr.realname, usr.sex, usr.fixed, usr.create_time, usr.update_time,
- usr.nickname,
+ usr.nickname,usr.status,
create_user.id create_user_id, create_user.username create_user_name,
update_user.id updete_user_id, update_user.username update_user_name
from "system_user" usr
left join "system_user" create_user on create_user.id = usr.create_user
left join "system_user" update_user on update_user.id = usr.update_user
+ left join "system_user_role" sur on sur.user_id = usr.id
<where>
usr.deleted = 0
<if test="dto.username != null and dto.username != ''">
@@ -80,6 +81,12 @@
<if test="dto.mobile != null and dto.mobile != ''">
AND usr.mobile LIKE '%'||#{dto.mobile}||'%'
</if>
+ <if test="dto.status != null ">
+ AND usr.status = #{dto.status}
+ </if>
+ <if test="dto.roleId != null and dto.roleId != ''">
+ AND sur.role_id = #{dto.roleId}
+ </if>
</where>
</select>
--
Gitblit v1.9.3