From 04a5a28ff32da9b9e35cfab8022a29b94def545d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 18 Jul 2021 11:59:56 +0800
Subject: [PATCH] 保安人员树接口修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 3f6f796..f95e892 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -149,18 +149,29 @@
blade_dept dept
WHERE
dept.is_deleted = 0
+ <if test="parentId!=null and parentId!=''">
+ and dept_category=1
+ </if>
)
union
(select
- id,
- dept_id parent_id,
- real_name AS title,
- id AS "value",
- id AS "key",
+ bu.id,
+ bu.dept_id parent_id,
+ bu.real_name AS title,
+ bu.id AS "value",
+ bu.id AS "key",
0 as "has_children"
- from blade_user
+ from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ where 1=1
+ <if test="parentId!=null and parentId!=''">
+ and dept_category=1
+ </if>
)
)c
</select>
--
Gitblit v1.9.3