From 30df94c05573a426d030510d4dd58ae1d93bfb7a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 14:03:37 +0800
Subject: [PATCH] 1.资格审查排序
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 120 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 31 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 646a324..f72ab34 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -140,9 +140,67 @@
<!-- </select> -->
<!--懒加载获取部门树形结构(包含用户数据)-->
+<!-- <select id="lazyTreeUser" resultMap="treeNodeResultMap">-->
+<!-- select DISTINCT * from (-->
+<!-- (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-->
+<!-- left join-->
+<!-- sys_information si-->
+<!-- on-->
+<!-- si.departmentid = dept.id-->
+<!-- WHERE-->
+<!-- dept.is_deleted = 0-->
+<!-- and si.stats = 2-->
+<!-- and si.departmentid !=1432626178757275649-->
+<!-- and si.departmentid !=1445980335107002370-->
+<!-- and si.departmentid !=1442115701350387714-->
+<!-- )-->
+<!-- union-->
+<!-- (select-->
+<!-- bu.id,-->
+<!-- bu.dept_id parent_id,-->
+<!-- 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-->
+<!-- left join-->
+<!-- sys_information si-->
+<!-- on-->
+<!-- si.departmentid = bd.id-->
+<!-- where bd.is_deleted = 0-->
+<!-- and bu.is_deleted = 0-->
+<!-- and bu.`status` =1-->
+<!-- and si.stats = 2-->
+<!-- and si.departmentid !=1432626178757275649-->
+<!-- and si.departmentid !=1445980335107002370-->
+<!-- and si.departmentid !=1442115701350387714-->
+<!-- )-->
+<!-- )c-->
+<!-- </select> -->
+
+ <!--懒加载获取部门树形结构(包含用户数据)-->
<select id="lazyTreeUser" resultMap="treeNodeResultMap">
select DISTINCT * from (
- (SELECT
+ (SELECT
dept.id,
dept.parent_id,
dept.dept_name AS title,
@@ -166,38 +224,38 @@
dept.is_deleted = 0
and si.stats = 2
and si.departmentid !=1432626178757275649
- <if test="parentId!=null and parentId!=0">
- and si.departmentid = 1111
- </if>
+ and si.departmentid !=1445980335107002370
+ and si.departmentid !=1442115701350387714
)
- <if test="parentId!=null and parentId!=0">
- union
- (select
- bu.id,
- bu.dept_id parent_id,
- 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
- left join
- sys_information si
- on
- si.departmentid = bd.id
- where bd.is_deleted = 0
- and bu.is_deleted = 0
- and bu.`status` =1
- and si.stats = 2
- and si.departmentid = #{parentId}
- and si.departmentid !=1432626178757275649
- )
- </if>
+ union
+ (select
+ bu.id,
+ bu.dept_id parent_id,
+ 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
+ left join
+ sys_information si
+ on
+ si.departmentid = bd.id
+ where bd.is_deleted = 0
+ and bu.is_deleted = 0
+ and bu.`status` =1
+ and si.stats = 2
+ and si.departmentid !=1432626178757275649
+ and si.departmentid !=1445980335107002370
+ and si.departmentid !=1442115701350387714
+ )
)c
</select>
+
+ <!--111-->
<!--懒加载获取部门树形结构(包含用户数据)-->
<!-- <select id="lazyTreeUser" resultMap="treeNodeResultMap">-->
@@ -260,7 +318,7 @@
<!--懒加载获取部门树形结构(包含用户数据)-->
<select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes" >
select DISTINCT
- *
+ *
from (
(SELECT
dept.id,
--
Gitblit v1.9.3