From 3b1bba4cae03694d1364115b9cd539bee066ce7e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 10 Sep 2021 15:50:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 361 +++++++++++++++++++++++++--------------------------
1 files changed, 175 insertions(+), 186 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 a2a2fb6..342af2b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -315,219 +315,208 @@
<!--懒加载获取部门树形结构(包含用户数据),未删除，在职-->
<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
- left join
- sys_information si
- on
- si.departmentid = dept.id
- WHERE
- dept.is_deleted = 0
- <if test="type==1">
- and dept_category=1
- </if>
- <if test="deptId!=null and deptId!=''">
- and dept.id = #{deptId}
- </if>
- )
+ (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
+ left join
+ sys_information si
+ on
+ si.departmentid = dept.id
+ WHERE
+ dept.is_deleted = 0
+ <if test="deptId!=null and deptId!=''">
+ and dept.id = #{deptId}
+ </if>
+ )
- union
+ 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
- left join
- blade_role br
- on
- br.id = bu.role_id
- where 1=1
- and bu.is_deleted = 0
- and bu.status = 1
- <if test="type==1">
- and dept_category=1
- and role_alias = '保安'
- </if>
- <if test="type==2 or type==3">
- and dept_category=2
- </if>
- <if test="deptId!=null and deptId!=''">
- and bu.dept_id = #{deptId}
- </if>
- <if test="jurisdiction!=null and jurisdiction!=''">
- and bu.jurisdiction = #{jurisdiction}
- </if>
- )
+ (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
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
+ where 1=1
+ and bu.is_deleted = 0
+ and bu.status = 1
+ <if test="type==1">
+ and role_alias = '保安'
+ </if>
+ <if test="deptId!=null and deptId!=''">
+ and bu.dept_id = #{deptId}
+ </if>
+ <if test="jurisdiction!=null and jurisdiction!=''">
+ and bu.jurisdiction = #{jurisdiction}
+ </if>
+ )
)c
</select>
<!--懒加载获取部门树形结构(包含用户数据)-->
<select id="lazyTreeUsersPublicSecurity" 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
- left join
- sys_information si
- on
- si.departmentid = dept.id
- WHERE
- dept.is_deleted = 0
- <if test="type==2 or type==3">
- and dept_category=2
- </if>
- <if test="deptId!=null and deptId!=''">
- and (dept.parent_id = #{deptId} or dept.id = #{deptId})
- </if>
- )
+ (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
+ left join
+ sys_information si
+ on
+ si.departmentid = dept.id
+ WHERE
+ dept.is_deleted = 0
+ <if test="deptId!=null and deptId!=''">
+ and (dept.parent_id = #{deptId} or dept.id = #{deptId})
+ </if>
+ )
- union
+ 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="type==2 or type==3">
- and dept_category=2
- </if>
- <if test="deptId!=null and deptId!=''">
- and (bd.parent_id = #{deptId} or bd.id = #{deptId})
- </if>
- )
+ (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
+ and bu.status = 1
+ <if test="deptId!=null and deptId!=''">
+ and (bd.parent_id = #{deptId} or bd.id = #{deptId})
+ </if>
+ )
)c
</select>
<!--懒加载获取部门树形结构(包含用户数据)-->
<select id="lazyTreeUsersPublicSecuritys" 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
- left join
- sys_information si
- on
- si.departmentid = dept.id
- WHERE
- dept.is_deleted = 0
- <if test="type==2 or type==3">
- and dept_category=2
- </if>
- )
+ (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
+ left join
+ sys_information si
+ on
+ si.departmentid = dept.id
+ WHERE
+ dept.is_deleted = 0
+ <if test="deptId!=null and deptId!=''">
+ and dept.id = #{deptId}
+ </if>
+ )
- union
+ 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="type==2 or type==3">
- and dept_category=2
- </if>
- )
+ (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
+ and bu.status = 1
+ <if test="deptId!=null and deptId!=''">
+ and bd.id = #{deptId}
+ </if>
+ )
)c
</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 0 ELSE 1 END
- FROM
- blade_dept
- WHERE
- parent_id = dept.id and is_deleted = 0
- ) AS "has_children"
- FROM
- blade_dept dept WHERE (
- SELECT
- CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
- FROM
- blade_dept
- WHERE
- parent_id = dept.id and is_deleted = 0
- ) =1
-</select>
+ 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 0 ELSE 1 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept WHERE (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) =1
+ </select>
<select id="getDeptNames" resultType="java.lang.String">
SELECT
--
Gitblit v1.9.3