From dfe379f10f5d16a3b34b33f260d3a7ca97c7fdc6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 十月 2025 14:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index d40bcf5..323b429 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -171,8 +171,10 @@
<select id="selectList" 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.code,
- 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.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack
+ ,d.dept_name AS deptName
from sys_user u
+ left join t_dept d on u.dept_id = d.id
WHERE u.del_flag = 0
</select>
<select id="selectCount" resultType="java.lang.Integer">
@@ -187,7 +189,7 @@
<select id="selectListByNamePhone" 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.code,
- 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.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack
from sys_user u
WHERE u.del_flag = 0
<if test="name != null and name != ''">
@@ -267,7 +269,7 @@
select * from sys_user
where 1=1
<if test="ids != null and ids.size()>0">
- AND deptId IN
+ AND dept_id IN
<foreach collection="ids" separator="," item="id" open="(" close=")">
#{id}
</foreach>
@@ -278,7 +280,7 @@
<select id="selectListByDeptId" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.*
- from sys_user u where u.deptId = #{deptId} and u.status = 0 and u.del_flag = 0
+ from sys_user u where u.dept_id = #{deptId} and u.status = 0 and u.del_flag = 0
</select>
<select id="selectListByDeptType" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.*
@@ -288,7 +290,7 @@
select u.*
from sys_user u where u.status = 0 and u.del_flag = 0
<if test="projectIds != null and projectIds.size() > 0">
- and u.deptId in
+ and u.dept_id in
<foreach item="item" collection="projectIds" open="(" separator="," close=")">
#{item}
</foreach>
@@ -300,7 +302,7 @@
and deptType = #{deptType}
</if>
<if test="projectIds != null and projectIds.size() > 0">
- and deptId in
+ and dept_id in
<foreach item="item" collection="projectIds" open="(" separator="," close=")">
#{item}
</foreach>
--
Gitblit v1.7.1