From f9ff113e9d2e9a3e643b185f08652004e5e43d94 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Dec 2021 16:19:37 +0800
Subject: [PATCH] 保安员统计导出，业务情况统计导出修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 2874a31..8e53366 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -372,17 +372,17 @@
SELECT IFNULL(B.cz, 0) as cz,
IFNULL(C.wcz, 0) as wcz
FROM (SELECT departmentid,jurisdiction FROM sys_information) A
- LEFT JOIN (SELECT COUNT(hold) as cz, dept_id
+ LEFT JOIN (SELECT COUNT(*) as cz, dept_id
FROM blade_user
WHERE hold = 1
AND role_id = '1412226235153731586'
- and status = 1
+ and status = 1 AND is_deleted = 0
GROUP BY dept_id) B ON A.departmentid = B.dept_id
- LEFT JOIN (SELECT COUNT(hold) as wcz, dept_id
+ LEFT JOIN (SELECT COUNT(*) as wcz, dept_id
FROM blade_user
WHERE hold = 2
AND role_id = '1412226235153731586'
- and status = 1
+ and status = 1 AND is_deleted = 0
GROUP BY dept_id) C ON A.departmentid = C.dept_id
WHERE A.jurisdiction in (${deptid})
GROUP BY cz, wcz
--
Gitblit v1.9.3