From 47e3e1c4d4ac42e64a0968e51d5051e276ffebae Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 24 Sep 2021 11:32:18 +0800
Subject: [PATCH] 1.ftp

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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 c227a9a..99ea931 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1622,12 +1622,23 @@
         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