From 6e8166012e4e5842cfdecd4d318f8f9ec6ac9f4d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 31 三月 2025 09:31:58 +0800
Subject: [PATCH] Merge branch 'dev'
---
system/src/main/resources/mapper/system/SysUserMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/system/src/main/resources/mapper/system/SysUserMapper.xml b/system/src/main/resources/mapper/system/SysUserMapper.xml
index 0130fef..abf1553 100644
--- a/system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -34,7 +34,9 @@
<result property="ancestors" column="ancestors" />
<result property="orderNum" column="order_num" />
<result property="leader" column="leader" />
+ <result property="phone" column="phone" />
<result property="status" column="dept_status" />
+ <result property="parentName" column="parent_name" />
</resultMap>
<resultMap id="RoleResult" type="SysRole">
@@ -48,7 +50,8 @@
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
- d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+ d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.status as dept_status,
+ (select dept_name from sys_dept where dept_id = d.parent_id) parent_name,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
@@ -65,6 +68,9 @@
</if>
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
+ </if>
+ <if test="nickName != null and nickName != ''">
+ AND u.nick_name like concat('%', #{nickName}, '%')
</if>
<if test="status != null and status != ''">
AND u.status = #{status}
@@ -128,6 +134,11 @@
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
+ </select>
+
+ <select id="selectUserByIds" parameterType="Long" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.user_id in <foreach collection="userIds" open="(" separator="," close=")" item="userId">#{userId}</foreach>
</select>
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -218,4 +229,7 @@
</foreach>
</delete>
+ <select id="getByDept" resultMap="SysUserResult">
+ select * from sys_user where dept_id = #{deptId} and del_flag = '0'
+ </select>
</mapper>
--
Gitblit v1.8.0