From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 3638236..3f39e2d 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -153,7 +153,7 @@
) H
LEFT JOIN
( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 0 or
- u.examination_type is null) and role_id =
+ u.examination_type is null OR u.examination_type = "") and role_id =
'1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
) A
ON H.departmentid = A.dept_id
@@ -258,7 +258,8 @@
AND dispatch = 0
GROUP BY
dept_id
- ) A ON A.dept_id = H.departmentid
+ ) A
+ ON A.dept_id = H.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS lastnum,
@@ -272,9 +273,15 @@
AND dispatch = 1
GROUP BY
dept_id
- ) B ON H.departmentid = B.dept_id where 1=1
+ ) B
+ ON H.departmentid = B.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = H.jurisdiction
+ where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and H.jurisdiction = #{jurisdiction}
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
@@ -284,20 +291,38 @@
<select id="selectSoil" resultType="java.util.HashMap">
SELECT IFNULL(A.numj, 0) as numj,
IFNULL(B.numwj, 0) as numz
- FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
- LEFT JOIN (SELECT COUNT(*) AS numj, dept_id
+ FROM
+ (
+ SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction
+ ) H
+ LEFT JOIN
+ (
+ SELECT COUNT(*) AS numj, dept_id
FROM blade_user
WHERE soil = 0 AND `status` = 1 AND is_deleted = 0 AND role_id = '1412226235153731586'
- GROUP BY dept_id) A ON A.dept_id = H.departmentid
- LEFT JOIN (SELECT COUNT(*) AS numwj, dept_id FROM blade_user WHERE soil = 1 and `status` = 1 AND is_deleted = 0
- AND role_id = '1412226235153731586' GROUP BY
- dept_id) B
- ON H.departmentid = B.dept_id where 1=1
+ GROUP BY dept_id
+ ) A
+ ON A.dept_id = H.departmentid
+ LEFT JOIN
+ (
+ SELECT COUNT(*) AS numwj, dept_id FROM blade_user
+ WHERE soil = 1
+ and `status` = 1
+ AND is_deleted = 0
+ AND role_id = '1412226235153731586'
+ GROUP BY dept_id
+ ) B
+ ON H.departmentid = B.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = H.jurisdiction
+ where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+ </if>
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
- </if>
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and H.jurisdiction = #{jurisdiction}
</if>
</select>
--
Gitblit v1.9.3