From f8b9ccf70df347ed40cadb44202e92a9cd812c3d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 09 十一月 2023 10:25:44 +0800
Subject: [PATCH] # 创建修改人
---
server/services/src/main/resources/mappers/SystemUserMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/resources/mappers/SystemUserMapper.xml b/server/services/src/main/resources/mappers/SystemUserMapper.xml
index 4e3503d..debe859 100644
--- a/server/services/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/services/src/main/resources/mappers/SystemUserMapper.xml
@@ -12,10 +12,12 @@
<association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
<result column="create_user_id" property="id"/>
<result column="create_user_name" property="username"/>
+ <result column="create_real_name" property="realname"/>
</association>
<association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
<result column="update_user_id" property="id"/>
<result column="update_user_name" property="username"/>
+ <result column="update_real_name" property="realname"/>
</association>
</resultMap>
<select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemUserDTO" resultMap="SystemUserListVO">
@@ -63,12 +65,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,
- create_user.id create_user_id, create_user.username create_user_name,
- update_user.id updete_user_id, update_user.username update_user_name
+ usr.nickname,usr.status,
+ create_user.id create_user_id, create_user.username create_user_name,create_user.realname create_real_name,
+ update_user.id updete_user_id, update_user.username update_user_name,update_user.realname update_real_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 +83,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