From d7dd6cbbad5213476bd1e98d65fee6056ad4c2fc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 06 Apr 2021 14:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
index f2e6aaf..4e648e7 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
@@ -74,6 +74,11 @@
ORDER BY sort
</select>
+ <select id="trees" resultMap="treeNodeResultMap">
+ select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0
+ ORDER BY sort
+ </select>
+
<select id="lazyTree" resultMap="treeNodeResultMap" >
SELECT
dept.id,
@@ -99,6 +104,29 @@
ORDER BY dept.sort
</select>
+ <select id="lazyTrees" resultMap="treeNodeResultMap" >
+ SELECT
+ dept.id,
+ dept.parent_id,
+ dept.dept_name AS title,
+ dept.id AS "value",
+ dept.id AS "key",
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept
+ WHERE
+ dept.parent_id = #{param2} AND dept.is_deleted = 0
+ and dept.tenant_id != 000000
+ ORDER BY dept.sort
+ </select>
+
<select id="getDeptNames" resultType="java.lang.String">
SELECT
dept_name
--
Gitblit v1.9.3