From 19be64fdf18b2ba079dfe7d904e7494ec1dbfbe2 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 27 Aug 2023 21:47:53 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20412=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/SysUserMapper.xml        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 2b3ed9f7..9c92de53 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
@@ -82,7 +82,7 @@
         u.avatar,
         u.wx_openid,
         u.qq_openid,
-    	u.gitee_login,
+        u.gitee_login,
         u.osc_id,
         u.del_flag,
         u.lock_flag,
@@ -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">