From 3ca2cf682283d3f58be80f678efedbb91260d67c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Sep 2021 15:02:29 +0800
Subject: [PATCH] 从业记录，组织机构类别去除
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 403 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 215 insertions(+), 188 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 0e26e87..342af2b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -37,6 +37,7 @@
<result column="has_children" property="hasChildren"/>
</resultMap>
+
<select id="lazyList" resultMap="deptVOResultMap">
SELECT
dept.* ,
@@ -104,6 +105,7 @@
<select id="securityLazyTree" resultMap="treeNodeResultMap" >
SELECT
+ DISTINCT
dept.id,
dept.parent_id,
dept.dept_name AS title,
@@ -125,12 +127,13 @@
si.departmentid = dept.id
WHERE
1=1
- and (stats = 1 or stats =2 or stats =4)
+ and dept_category = 1
AND dept.is_deleted = 0
+ and dept.id !=1420222961377357825
+ and dept.parent_id!=1420222961377357825
<if test="param1!=null and param1!='' and param1!='1123598813738675201'">
and si.jurisdiction = #{param1}
</if>
- ORDER BY dept.sort
</select>
<!--懒加载获取部门树形结构(按分类查询)-->
@@ -224,6 +227,7 @@
bd.id = bu.dept_id
where 1=1
and bu.is_deleted = 0
+ and bu.status = 1
<if test="type==1">
and dept_category=1
</if>
@@ -311,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 = '保安' or 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
@@ -570,5 +563,39 @@
<insert id="add" parameterType="org.springblade.modules.system.entity.Dept" useGeneratedKeys="true" keyProperty="id">
insert into blade_dept(tenant_id, parent_id,ancestors,dept_category,dept_name) values(#{tenantId}, #{parentId}, #{ancestors}, #{deptCategory}, #{deptName})
</insert>
+ <select id="selectInfo" resultMap="treeNodeResultMap">
+ SELECT
+ DISTINCT
+ 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
+ 1=1
+ AND dept.is_deleted = 0
+ and dept.id !=1420222961377357825
+ and dept.id !=1432625856013971457
+ and dept.parent_id!=1420222961377357825
+ and dept.parent_id!=1432625856013971457
+ </select>
+ <!--查询所有的部门信息-->
+ <select id="selDeptList" resultType="org.springblade.common.vo.DeptVo">
+ select id ,dept_name deptName from blade_dept where is_deleted=0
+ </select>
</mapper>
--
Gitblit v1.9.3