From c0a78b608d90f13fc34018c8d88ddf5c44acdbd7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 12 Aug 2021 10:17:09 +0800
Subject: [PATCH] 1.数据源修改 2.单位添加字段
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 79 insertions(+), 8 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 72aa7d8..7fa1e5b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -92,12 +92,53 @@
FROM
blade_dept dept
WHERE
- dept.parent_id = #{param2} AND dept.is_deleted = 0
+ dept.is_deleted = 0
+ <if test="param2!=null and param2!=0">
+ and dept.parent_id = #{param2}
+ </if>
<if test="param1!=null and param1!=''">
and dept.tenant_id = #{param1}
</if>
ORDER BY dept.sort
</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
+ WHERE
+ dept.is_deleted = 0
+ )
+
+ union
+
+ (select
+ id,
+ dept_id parent_id,
+ real_name AS title,
+ id AS "value",
+ id AS "key",
+ 0 as "has_children"
+ from blade_user
+ )
+ )c
+ </select>
+
@@ -142,21 +183,27 @@
<select id="selectIn" resultType="java.util.HashMap">
SELECT
- id,
- dept_name
+ id as deptid,
+ dept_name as deptname
FROM
- blade_dept
+ blade_dept where is_deleted = 0
</select>
<!--统计单位类型数量-->
<select id="selectCount" resultType="java.util.HashMap">
- SELECT dept.id as jurisdiction,dept.dept_name AS title FROM blade_dept dept WHERE dept.dept_name like concat(concat('%', #{name}),'%')
+ SELECT
+ id as jurisdiction,
+ dept_name AS title
+ FROM
+ sys_jurisdiction
+ WHERE
+ is_deleted = 0 AND parent_id!=0
</select>
<select id="selectHold" resultType="java.util.HashMap">
SELECT
- ISNULL(B.cz,0) as cz,
- ISNULL(C.wcz,0) as wcz
+ IFNULL(B.cz,0) as cz,
+ IFNULL(C.wcz,0) as wcz
FROM (SELECT jurisdiction FROM blade_user ) A
LEFT JOIN (SELECT COUNT(hold) as cz,jurisdiction FROM blade_user WHERE hold=0 GROUP BY jurisdiction ) B ON A.jurisdiction=B.jurisdiction
LEFT JOIN (SELECT COUNT(hold) as wcz,jurisdiction FROM blade_user WHERE hold=1 GROUP BY jurisdiction ) C ON A.jurisdiction=C.jurisdiction
@@ -167,5 +214,29 @@
<select id="selectId" resultType="java.util.HashMap">
SELECT id FROM blade_dept WHERE parent_id =#{id} and is_deleted = 0
</select>
-
+ <select id="securityLazyTree" 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 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.parent_id = #{param2} AND dept.is_deleted = 0
+ and dept_category = 1
+ <if test="param1!=null and param1!=''">
+ and dept.tenant_id = #{param1}
+ </if>
+ ORDER BY dept.sort
+ </select>
</mapper>
--
Gitblit v1.9.3