From 48ef766ab028b5550733cab5f95407a51f3283da Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 17:59:35 +0800
Subject: [PATCH] 验收版派遣查询接口修改

---
 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