From 17069258ffbe0c9b9bcc781edd4e2b1ea6b758ed Mon Sep 17 00:00:00 2001
From: yurin <wuti@morninginnovation.com>
Date: Sun, 27 Aug 2023 12:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/SysUserMapper.xml           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml
index 2b3ed9f7d..00ac0f5c6 100644
--- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -103,8 +103,8 @@
         FROM
         sys_user u
         LEFT JOIN sys_user_role urole ON urole.user_id = u.user_id
-        LEFT JOIN sys_role r ON r.role_id = urole.role_id
-        WHERE u.username = #{username}
+        LEFT JOIN sys_role r ON r.role_id = urole.role_id and r.del_flag = '0'
+        WHERE u.username = #{username} and u.del_flag = '0'
     </select>
 
     <select id="getUserVoById" resultMap="baseResultMap">
@@ -112,9 +112,9 @@
         <include refid="userRoleDeptSql"/>
         FROM
         sys_user u
-        LEFT JOIN sys_dept d ON d.dept_id = u.dept_id
+        LEFT JOIN sys_dept d ON d.dept_id = u.dept_id and d.del_flag = '0'
         WHERE
-        u.user_id = #{id}
+        u.user_id = #{id} and u.del_flag = '0'
     </select>
 
     <select id="getUserVosPage" resultMap="baseResultMap">