From 1a2e22a27627b40689257442cc5a46598c634f8e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 14:16:28 +0800
Subject: [PATCH] 测评接口完成,添加数据权限

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 3a9612d..ea9006a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -259,6 +259,25 @@
 	<select id="listByRole" resultType="com.ruoyi.common.core.domain.entity.SysUser">
 		select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
 			   u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
+			   u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack,
+			   u.districtId AS districtId, u.role_type AS roleType,r.role_id AS roleId
+		from sys_user u
+		left join sys_user_role ur on u.user_id = ur.user_id
+		left join sys_role r on r.role_id = ur.role_id
+		WHERE u.del_flag = 0
+		<if test="userIds != null and userIds.size()>0">
+			AND u.user_id IN
+			<foreach collection="userIds" close=")" open="(" item="userId" separator=",">
+				#{userId}
+			</foreach>
+		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name LIKE concat('%',#{nickName},'%')
+		</if>
+	</select>
+	<select id="selectListByNameAndUserIds" resultType="com.ruoyi.common.core.domain.entity.SysUser">
+		select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
+			   u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
 			   u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId
 		from sys_user u
 		WHERE u.del_flag = 0

--
Gitblit v1.7.1