From e5568298496e9fede40b4e4b2d5d6e3d351f994e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 25 Nov 2021 10:38:42 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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 0d7733e..afd0da7 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1614,8 +1614,10 @@
         ON A.departmentid = B.dept_id
         LEFT JOIN
         (
-        SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586'
+        SELECT COUNT( * ) AS znum, dept_id FROM blade_user
+        WHERE role_id = '1412226235153731586'
         and status=1
+        and is_deleted = 0
         GROUP BY dept_id
         ) C
         ON A.departmentid = C.dept_id
@@ -1626,12 +1628,22 @@
         ON A.departmentid = D.dept_id
         LEFT JOIN
         (
-        SELECT COUNT( * ) AS cznum, dept_id FROM blade_user where hold = 1 GROUP BY dept_id
+        SELECT COUNT( * ) AS cznum, dept_id FROM blade_user
+        where hold = 1
+        and role_id = '1412226235153731586'
+        and status= 1
+        and is_deleted = 0
+        GROUP BY dept_id
         ) E
         ON A.departmentid = E.dept_id
         LEFT JOIN
         (
-        SELECT COUNT( * ) AS pqnum, dept_id FROM blade_user where dispatch = 0 GROUP BY dept_id
+        SELECT COUNT( * ) AS pqnum, dept_id FROM blade_user
+        where dispatch = 0
+        and role_id = '1412226235153731586'
+        and status= 1
+        and is_deleted = 0
+        GROUP BY dept_id
         ) F
         ON A.departmentid = F.dept_id
         where 1=1

--
Gitblit v1.9.3