From 3d65f5d38805c7768073a96b4e3773a03a38db17 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 13 Apr 2026 11:13:27 +0800
Subject: [PATCH] fix:需要把用户是0的也查询出来

---
 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml
index 12b7415..93a8672 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml
@@ -46,16 +46,16 @@
             and u.tenant_id = #{user.tenantId}
         </if>
         <if test="user.account!=null and user.account != ''">
-            and u.account = #{user.account}
+            and u.account like CONCAT('%', #{user.account}, '%')
         </if>
         <if test="user.realName!=null and user.realName != ''">
-            and u.real_name = #{user.realName}
+            and u.real_name like CONCAT('%', #{user.realName}, '%')
         </if>
         <if test="user.userType!=null and user.userType != ''">
             and u.user_type = #{user.userType}
         </if>
         <if test="user.sysType!=null and user.sysType != ''">
-            and r.sys_type = #{user.sysType}
+            and (r.sys_type = #{user.sysType} or r.sys_type  = '0')
         </if>
         <if test="deptIdList!=null and deptIdList.size>0">
             and u.id in (
@@ -97,4 +97,12 @@
         </foreach>
     </update>
 
+    <!-- 根据部门ID查询用户列表 -->
+    <select id="selectUsersByDeptId" resultMap="userResultMap">
+        SELECT *
+        FROM blade_user
+        WHERE dept_id = #{deptId}
+        AND is_deleted = 0
+    </select>
+
 </mapper>

--
Gitblit v1.9.3