From 2535346464dec2b661e79857ebba335355911552 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 21 Feb 2024 13:52:34 +0800
Subject: [PATCH] 自查+物业项目经理查询优化
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 5ba1cd6..4433989 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -109,8 +109,8 @@
<!--用户详情map-->
<resultMap id="selectUserDetailMap" type="org.springblade.modules.system.vo.UserDetailVO" autoMapping="true">
- <id property="id" column="id" />
- <collection property="deptList" javaType="java.util.List"
+ <id property="id" column="id"/>
+ <collection property="deptList" javaType="java.util.List"
ofType="org.springblade.modules.system.vo.DeptDetailVO" autoMapping="true">
<id property="id" column="cid"/>
<id property="level" column="region_level"/>
@@ -224,7 +224,8 @@
( SELECT id, parent_id FROM blade_dept ORDER BY parent_id, id ) org_query,
(SELECT @id := #{deptId} ) initialisation
WHERE
- FIND_IN_SET( parent_id, @id ) > 0 AND @id := CONCAT( @id, ',', id )
+ (FIND_IN_SET( parent_id, @id ) > 0 or FIND_IN_SET( id, @id ) > 0)
+ AND @id := CONCAT( @id, ',', id )
)
</select>
--
Gitblit v1.9.3