From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 16 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 aed1aaf..62462a6 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -119,11 +119,15 @@
) AS "has_children"
FROM
blade_dept dept
+ left join
+ sys_information si
+ on
+ si.departmentid = dept.id
WHERE
dept.parent_id = #{param2} AND dept.is_deleted = 0
and dept_category = 1
<if test="param1!=null and param1!=''">
- and dept.tenant_id = #{param1}
+ and si.jurisdiction = #{param1}
</if>
ORDER BY dept.sort
</select>
@@ -160,20 +164,7 @@
<!--懒加载获取部门树形结构(包含用户数据)app-->
<select id="lazyTreeUserApp" resultType="org.springblade.modules.system.vo.DeptAndUserVO" >
select DISTINCT
- c.id,
- c.parent_id,
- c.title,
- c.value,
- c.key,
- (
- SELECT
- CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
- FROM
- blade_dept
- where
- id = c.parent_id
- and dept_category=1
- ) AS "has_children"
+ *
from (
(SELECT
dept.id,
@@ -287,7 +278,7 @@
dept.is_deleted = 0
<if test="parentId!=null and parentId!=''">
and dept_category=1
- AND dept.id = #{parentId}
+ AND dept.parent_id = #{parentId}
</if>
)
@@ -316,6 +307,60 @@
</select>
+ <!--懒加载获取部门树形结构(包含用户数据)-->
+ <select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes" >
+ select DISTINCT
+ *
+ from (
+ (SELECT
+ dept.id,
+ dept.parent_id parentId,
+ 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.is_deleted = 0
+ <if test="parentId!=null and parentId!='' or parentId==0">
+ and dept_category=1
+ AND dept.parent_id = #{parentId}
+ </if>
+ )
+
+ union
+
+ (select
+ bu.id,
+ bu.dept_id parentId,
+ bu.real_name AS title,
+ bu.id AS "value",
+ bu.id AS "key",
+ 0 as "has_children"
+ from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ where 1=1
+ and bu.is_deleted = 0
+ <if test="parentId!=null and parentId!='' or parentId==0">
+ and dept_category=1
+ AND bu.dept_id = #{parentId}
+ </if>
+ )
+ )c
+ </select>
+
+
<select id="lazyTrees" resultMap="treeNodeResultMap" >
SELECT
--
Gitblit v1.9.3