From 01233bc13663145957c9fcfce94b8eb87fee0714 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 25 Nov 2021 15:22:59 +0800
Subject: [PATCH] 派遣，考试，公司查询修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 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..fb45936 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -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