From 1fb3fba07c674776e818ef0389a68798a7ab0f48 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 25 Aug 2021 14:30:57 +0800
Subject: [PATCH] 1.单位

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 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 290a509..e2b3048 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -464,7 +464,7 @@
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586'
+        role_id = '1412226235153731586' and status=1
         AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
         GROUP BY
         dept_id,
@@ -478,7 +478,7 @@
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586'
+        role_id = '1412226235153731586' and status=1
         AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
         GROUP BY
         dept_id,
@@ -995,7 +995,7 @@
         d.dept_name AS deptname,
         j.dept_name AS jurname
         FROM
-        ( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' GROUP BY
+        ( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' and status=1 GROUP BY
         dept_id, jurisdiction ) A
         LEFT JOIN (
         SELECT
@@ -1005,7 +1005,7 @@
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586'
+        role_id = '1412226235153731586' and status=1
         AND hold=1
         GROUP BY
         dept_id,
@@ -1019,7 +1019,7 @@
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586'
+        role_id = '1412226235153731586' and status=1
         AND dispatch=0
         GROUP BY
         dept_id,
@@ -1033,7 +1033,7 @@
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586'
+        role_id = '1412226235153731586' and status=1
         AND dispatch=1
         GROUP BY
         dept_id,
@@ -1050,7 +1050,7 @@
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586'
+        role_id = '1412226235153731586' and status=1
         AND photo=1
         GROUP BY
         dept_id,
@@ -1064,7 +1064,7 @@
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586'
+        role_id = '1412226235153731586' and status=1
         AND examination_mx=1
         GROUP BY
         dept_id,
@@ -1137,14 +1137,14 @@
         ) A
         LEFT JOIN (SELECT COUNT(*) AS znum, dept_id, jurisdiction
         FROM blade_user
-        WHERE role_id = '1412226235153731586'
+        WHERE role_id = '1412226235153731586' and status=1
         GROUP BY dept_id, jurisdiction) B ON A.departmentid = B.dept_id
         LEFT JOIN (
         SELECT COUNT(*) AS zcnum,
         dept_id,
         jurisdiction
         FROM blade_user
-        WHERE role_id = '1412226235153731586'
+        WHERE role_id = '1412226235153731586' and status=1
         AND examination_type = 0
         GROUP BY dept_id,
         jurisdiction
@@ -1154,7 +1154,7 @@
         dept_id,
         jurisdiction
         FROM blade_user
-        WHERE role_id = '1412226235153731586'
+        WHERE role_id = '1412226235153731586' and status=1
         AND hold = 1
         GROUP BY dept_id,
         jurisdiction
@@ -1218,14 +1218,14 @@
         dept_id,
         jurisdiction
         FROM blade_user
-        WHERE role_id = '1412226235153731586'
+        WHERE role_id = '1412226235153731586' and status=1
         AND dispatch = 0
         GROUP BY dept_id,
         jurisdiction
         ) D ON A.departmentid = D.dept_id
         LEFT JOIN (SELECT COUNT(*) AS znum, dept_id, jurisdiction
         FROM blade_user
-        WHERE role_id = '1412226235153731586'
+        WHERE role_id = '1412226235153731586' and status=1
         GROUP BY dept_id, jurisdiction) E ON A.departmentid = E.dept_id) J
         WHERE 1=1
         <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
@@ -1262,7 +1262,7 @@
         ) A
         LEFT JOIN ( SELECT COUNT( * ) AS num, dept_id FROM sys_dispatcher_unit GROUP BY dept_id ) B ON A.departmentid =
         B.dept_id
-        LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' GROUP BY
+        LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' and status=1  GROUP BY
         dept_id ) C ON A.departmentid = C.dept_id
         where 1=1
         <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">

--
Gitblit v1.9.3