From 780ec2ea0b558c5603012abbfb8c1fa9845e6734 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 30 Jul 2021 18:04:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

---
 src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml |   69 ++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 0 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 006f798..e007344 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -157,6 +157,75 @@
         ORDER BY dept.sort
     </select>
 
+    <!--懒加载获取部门树形结构(包含用户数据)app-->
+    <select id="lazyTreeUserApp" resultType="org.springblade.modules.system.vo.DeptAndUserVO" >
+        select DISTINCT  * from (
+        (SELECT
+        dept.id,
+        dept.parent_id,
+        dept.dept_name AS label,
+        dept.id AS "key",
+        dept.id AS "value",
+        (
+        SELECT
+        CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+        FROM
+        blade_dept
+        WHERE
+        parent_id = dept.id and dept.is_deleted = 0
+        ) AS "has_children"
+        FROM
+        blade_dept dept
+        left join
+        blade_user bu
+        on
+        bu.dept_id = dept.id
+        WHERE
+        dept.is_deleted = 0
+        <if test="type==1">
+            and dept_category=1
+            AND dept.parent_id = "1413470343230877697"
+        </if>
+        <if test="type==2 or type==3">
+            and dept_category=2
+            AND dept.parent_id = "1123598813738675201"
+        </if>
+        <if test="type==4 and jurisdiction!=null and jurisdiction!=''">
+            and dept_category=1
+            AND dept.parent_id = "1413470343230877697"
+            and bu.jurisdiction = #{jurisdiction}
+        </if>
+        )
+
+        union all
+
+        (select
+        bu.id,
+        bu.dept_id  parent_id,
+        bu.real_name AS label,
+        bu.id AS "key",
+        bu.id AS "value",
+        0 as "has_children"
+        from blade_user bu
+        left join
+        blade_dept bd
+        on
+        bd.id = bu.dept_id
+        where 1=1
+        <if test="type==1">
+            and dept_category=1
+        </if>
+        <if test="type==2 or type==3">
+            and dept_category=2
+        </if>
+        <if test="type==4 and jurisdiction!=null and jurisdiction!=''">
+            and dept_category=1
+            and bu.jurisdiction = #{jurisdiction}
+        </if>
+        )
+        )c
+    </select>
+
     <!--懒加载获取部门树形结构(包含用户数据)-->
     <select id="lazyTreeUser" resultMap="treeNodeResultMap" >
         select DISTINCT  * from (

--
Gitblit v1.9.3