From 486f6cda7ccd893f7ff91c088b2f26b991a08f2b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 09 Dec 2021 11:36:18 +0800
Subject: [PATCH] 1.首页现实表现
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 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 447099a..8e53366 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -370,23 +370,22 @@
<select id="selectHold" resultType="java.util.HashMap">
SELECT IFNULL(B.cz, 0) as cz,
- IFNULL(C.wcz, 0) as wcz,
- A.jurisdiction
- FROM (SELECT jurisdiction FROM blade_user) A
- LEFT JOIN (SELECT COUNT(hold) as cz, jurisdiction
+ IFNULL(C.wcz, 0) as wcz
+ FROM (SELECT departmentid,jurisdiction FROM sys_information) A
+ LEFT JOIN (SELECT COUNT(*) as cz, dept_id
FROM blade_user
WHERE hold = 1
AND role_id = '1412226235153731586'
- and status = 1
- GROUP BY jurisdiction) B ON A.jurisdiction = B.jurisdiction
- LEFT JOIN (SELECT COUNT(hold) as wcz, jurisdiction
+ and status = 1 AND is_deleted = 0
+ GROUP BY dept_id) B ON A.departmentid = B.dept_id
+ LEFT JOIN (SELECT COUNT(*) as wcz, dept_id
FROM blade_user
WHERE hold = 2
AND role_id = '1412226235153731586'
- and status = 1
- GROUP BY jurisdiction) C ON A.jurisdiction = C.jurisdiction
+ and status = 1 AND is_deleted = 0
+ GROUP BY dept_id) C ON A.departmentid = C.dept_id
WHERE A.jurisdiction in (${deptid})
- GROUP BY cz, wcz, jurisdiction
+ GROUP BY cz, wcz
</select>
<!--查询部门下面的所有单位-->
@@ -396,7 +395,29 @@
WHERE parent_id = #{id}
and is_deleted = 0
</select>
+
+ <!--保安公司树-->
<select id="securityLazyTree" resultMap="treeNodeResultMap">
+ (
+ SELECT
+ id,
+ parent_id,
+ dept_name AS title,
+ id AS "value",
+ id AS "key",
+ 0 AS "has_children"
+ FROM
+ blade_dept
+ where is_deleted = 0
+ and
+ (id = 1413470343230877697
+ or id = 1425366663452196865
+ or id = 1418458374477549569
+ or id = 1420222768149966850
+ or id = 1426354978959691778)
+ )
+ union
+ (
SELECT
DISTINCT
dept.id,
@@ -418,14 +439,17 @@
sys_information si
on
si.departmentid = dept.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
WHERE
1=1
- and dept_category = 1
+ and si.stats !=3
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 test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
</if>
+ )
</select>
</mapper>
--
Gitblit v1.9.3