From 486f6cda7ccd893f7ff91c088b2f26b991a08f2b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 09 Dec 2021 11:36:18 +0800
Subject: [PATCH] 1.首页现实表现

---
 src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 d1ff6bd..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
@@ -445,7 +445,7 @@
         sj.id = si.jurisdiction
         WHERE
         1=1
-        and si.stats != 4
+        and si.stats !=3
         AND dept.is_deleted = 0
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
             and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})

--
Gitblit v1.9.3