From 92d375e11f68b898cd8a46cf02bcb82cd469ded5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 02 Sep 2021 11:58:02 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 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 f6642a1..ba52207 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,
@@ -124,12 +126,14 @@
on
si.departmentid = dept.id
WHERE
- dept.parent_id = #{param2} AND dept.is_deleted = 0
+ 1=1
and dept_category = 1
- <if test="param1!=null and param1!=''">
+ 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>
<!--懒加载获取部门树形结构(按分类查询)-->
@@ -223,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>
@@ -307,7 +312,7 @@
</select>
- <!--懒加载获取部门树形结构(包含用户数据)-->
+ <!--懒加载获取部门树形结构(包含用户数据),未删除，在职-->
<select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes" >
select DISTINCT
*
@@ -356,10 +361,16 @@
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
@@ -563,5 +574,33 @@
<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_category = 1
+ AND dept.is_deleted = 0
+ and dept.id !=1420222961377357825
+ and dept.parent_id!=1420222961377357825
+ </select>
</mapper>
--
Gitblit v1.9.3