From 0f22f66ae9d2156b983f533beb17a0062a949524 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 26 十月 2025 20:46:28 +0800
Subject: [PATCH] Merge branch 'master' into 1027-master
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 464b361..5be683e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -119,12 +119,15 @@
u.birthday,
u.job_phone,
u.phonenumber, u.sex, u.status,
- u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
+ u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name from sys_user
u
- left join sys_dept d on u.dept_id = d.dept_id
+ left join sys_user_dept d on u.user_id = d.user_id
where u.del_flag = '0'
- <if test="userId != null and userId != 0">
+ <if test="userId != null">
AND u.user_id = #{userId}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ AND u.orgid = #{orgid}
</if>
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
@@ -398,12 +401,12 @@
<delete id="deleteUserById" parameterType="Long">
update sys_user
- set del_flag = '2'
+ set del_flag = '1'
where user_id = #{userId}
</delete>
<delete id="deleteUserByIds" parameterType="Long">
- update sys_user set del_flag = '2' where user_id in
+ update sys_user set del_flag = '1' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
--
Gitblit v1.9.3