From 79ac8d0cee3b8dfea64b4d9a1ebdeb846490ecf0 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 13 Apr 2026 10:30:14 +0800
Subject: [PATCH] opt:任务查询优化
---
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 22d1ead..7343b98 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
@@ -32,10 +32,10 @@
<select id="selectUserPage" resultMap="userResultMap">
SELECT
u.*,
- GROUP_CONCAT(r.id) AS roleId
+ string_agg(r.id::varchar, ',') AS roleId
FROM blade_user u
INNER JOIN blade_role r
- ON FIND_IN_SET(r.id, u.role_id) > 0
+ ON r.id::varchar = ANY(string_to_array(u.role_id, ','))
AND r.is_deleted = 0
WHERE u.is_deleted = 0
and u.id != 1123598821738675201
@@ -46,10 +46,10 @@
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}
@@ -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