From de09889cb97fcd7e9ae3236d3cb0d9f2f752e439 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 22 Apr 2026 15:26:30 +0800
Subject: [PATCH] fix: 删除机构异常
---
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..a732567 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,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 (u.sys_type = #{user.sysType} or u.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