From cd4d500d96857baeb5979a1c601afcbb89e13dea Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 30 Aug 2021 10:34:26 +0800
Subject: [PATCH] 1.附件

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 98b7c58..564f306 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -61,9 +61,11 @@
         IFNULL(C.pnum ,0) as pnum
         FROM
         sys_information i
-        LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
+        LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE
+        ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' ) AND
         status=1 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
-        LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
+        LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE
+        ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' ) AND
         status=1 AND hold=1 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
         LEFT JOIN ( SELECT COUNT( * ) AS pnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
         status=1 AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
@@ -229,7 +231,8 @@
         FROM
         blade_user
         WHERE
-        `status` = 1
+        ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+        and `status` = 1
         AND is_deleted = 0
         AND dispatch = 0
         GROUP BY
@@ -242,7 +245,8 @@
         FROM
         blade_user
         WHERE
-        `status` = 1
+        ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+        and `status` = 1
         AND is_deleted = 0
         AND dispatch = 1
         GROUP BY

--
Gitblit v1.9.3