From a97bfb7462694708f2bda802797dc4dcf6d2341a Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Mon, 28 Aug 2023 20:33:41 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E9=87=8D=E5=A4=8D=E5=88=A0=E9=99=A4=E5=90=8E=E5=86=8D?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=EF=BC=8C=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
index 441f9aab3..8b7752f6f 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -104,8 +104,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">
@@ -113,9 +113,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">