From 1ef50a6d5ba5f59ae6ca216ddd4db2ceb5998c7d Mon Sep 17 00:00:00 2001
From: PIG AI <wangiegie@gmail.com>
Date: Wed, 16 Jul 2025 22:48:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(upms):=20=E8=B0=83=E6=95=B4User=20SQL?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=A1=BA=E5=BA=8F=E9=81=BF=E5=85=8D=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/SysUserMapper.xml   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 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 676be63a0..fd323ae1b 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
@@ -106,6 +106,7 @@
         u.user_id = #{id} and u.del_flag = '0'
     </select>
 
+
     <select id="getUserVosPage" resultMap="baseResultMap">
         SELECT
         <include refid="userColumns"/>,
@@ -113,26 +114,30 @@
         FROM
         sys_user u
         LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
+        AND ud.tenant_id = #{query.tenantId}
         WHERE
-        ud.tenant_id = #{query.tenantId}
-        AND u.del_flag = '0'
+        u.del_flag = '0'
+        AND u.tenant_id = #{query.tenantId}
+        AND (ud.tenant_id = #{query.tenantId} OR ud.tenant_id IS NULL)
+
         <!-- 用户名模糊查询 -->
         <if test="query.username != null and query.username != ''">
             <bind name="usernameLike" value="'%' + query.username + '%'"/>
             AND u.username LIKE #{usernameLike}
         </if>
+
         <!-- 部门精确查询 -->
         <if test="query.deptId != null and query.deptId != ''">
             AND ud.dept_id = #{query.deptId}
         </if>
+
         <!-- 手机号模糊查询 -->
         <if test="query.phone != null and query.phone != ''">
             <bind name="phoneLike" value="'%' + query.phone + '%'"/>
             AND u.phone LIKE #{phoneLike}
         </if>
-        OR ud.tenant_id IS NULL
-        ORDER BY
-        u.create_time DESC
+
+        ORDER BY u.create_time DESC
     </select>
 
     <select id="getUserVoListByScope" resultMap="baseResultMap">
@@ -143,8 +148,8 @@
         sys_user u
         LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
         WHERE
-        ud.tenant_id = #{query.tenantId}
-        AND u.del_flag = '0'
+        u.del_flag = '0'
+        AND (ud.tenant_id = #{query.tenantId} OR ud.tenant_id IS NULL)
         <!-- 用户名模糊查询 -->
         <if test="query.username != null and query.username != ''">
             <bind name="usernameLike" value="'%' + query.username + '%'"/>
@@ -166,7 +171,6 @@
                 #{id}
             </foreach>
         </if>
-        OR ud.tenant_id IS NULL
         ORDER BY
         u.create_time DESC
     </select>