From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 157 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 146 insertions(+), 11 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 bac3c75..28cae77 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -372,17 +372,17 @@
SELECT IFNULL(B.cz, 0) as cz,
IFNULL(C.wcz, 0) as wcz
FROM (SELECT departmentid,jurisdiction FROM sys_information) A
- LEFT JOIN (SELECT COUNT(hold) as cz, dept_id
+ LEFT JOIN (SELECT COUNT(*) as cz, dept_id
FROM blade_user
WHERE hold = 1
AND role_id = '1412226235153731586'
- and status = 1
+ and status = 1 AND is_deleted = 0
GROUP BY dept_id) B ON A.departmentid = B.dept_id
- LEFT JOIN (SELECT COUNT(hold) as wcz, dept_id
+ LEFT JOIN (SELECT COUNT(*) as wcz, dept_id
FROM blade_user
WHERE hold = 2
AND role_id = '1412226235153731586'
- and status = 1
+ 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
@@ -395,6 +395,65 @@
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,-->
+<!-- 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-->
+<!-- left join-->
+<!-- sys_jurisdiction sj-->
+<!-- on-->
+<!-- sj.id = si.jurisdiction-->
+<!-- WHERE-->
+<!-- 1=1-->
+<!-- and si.stats !=3-->
+<!-- AND dept.is_deleted = 0-->
+<!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
+<!-- and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})-->
+<!-- </if>-->
+<!-- )-->
+<!-- </select>-->
+
+ <!--查询保安公司列表，保安员管理-->
<select id="securityLazyTree" resultMap="treeNodeResultMap">
SELECT
DISTINCT
@@ -417,14 +476,90 @@
sys_information si
on
si.departmentid = dept.id
- WHERE
- 1=1
- and dept_category = 1
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ where
+ dept.dept_category != 0
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}
+ and dept.id!= 1420222961377357825
+ and dept.parent_id!= 1420222961377357825
+ and dept.id!= 1418458374477549569
+ and dept.parent_id!= 1418458374477549569
+ and dept.id!= 1426355050199945218
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+ union
+ (
+ 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 = 1420222768149966850
+ or id = 1426354978959691778)
+ )
</if>
</select>
+
+ <!--查询所有的保安公司机构及子级信息-->
+ <select id="securityDeptUnitList" resultMap="treeNodeResultMap">
+ (
+ SELECT
+ id,
+ parent_id,
+ dept_name AS title,
+ id AS "value",
+ id AS "key",
+ 0 AS "has_children"
+ FROM
+ blade_dept
+ where id = #{deptId}
+ )
+ union
+ (
+ 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
+ ) AS "has_children"
+ FROM
+ (
+ SELECT
+ id,parent_id,dept_name
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{deptId} ) t2
+ ) t3
+ WHERE
+ ischild != 0
+ )
+ dept
+ where 1=1
+ )
+ </select>
</mapper>
--
Gitblit v1.9.3