fix(upms): 调整User SQL条件顺序避免逻辑删除不生效问题

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>