From 3432fad3ebcecd73d3d50fa8dfb7934cc61cfd06 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 15:04:16 +0800
Subject: [PATCH] 保安员查询新增审查排序
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 118 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 29 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 d1b1420..3bd13d1 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -39,17 +39,17 @@
<select id="lazyList" resultMap="deptVOResultMap">
SELECT
- dept.* ,
- (
- 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"
+ dept.* ,
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
FROM
- blade_dept dept
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept
WHERE dept.is_deleted = 0
<if test="param1!=null and param1!=''">
and dept.tenant_id = #{param1}
@@ -74,23 +74,23 @@
ORDER BY sort
</select>
- <select id="lazyTree" resultMap="treeNodeResultMap" >
+ <select id="lazyTree" 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"
+ 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 dept
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept
WHERE
dept.is_deleted = 0
<if test="param2!=null and param2!=0">
@@ -102,9 +102,45 @@
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>
- <select id="lazyTrees" resultMap="treeNodeResultMap" >
+ <select id="lazyTrees" resultMap="treeNodeResultMap">
SELECT
dept.id,
dept.parent_id,
@@ -164,8 +200,8 @@
<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
@@ -176,5 +212,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