From 852dc5abc24c3853a2d14de1f5b800823aaa49a9 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 18 Nov 2021 17:09:24 +0800
Subject: [PATCH] 1.统计

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 8a180f4..abe9736 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -228,6 +228,9 @@
         and bd.parent_id!=1425365577303621633
         and bd.id != 1425365577303621633
         and bd.id != 1432625856013971457
+        <if test="user.deptId!=null and user.deptId!=''">
+            and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
+        </if>
         <if test="user.cardid!=null and user.cardid != ''">
             and bu.cardid like concat(concat('%', #{user.cardid}),'%')
         </if>
@@ -254,9 +257,6 @@
         </if>
         <if test="user.securitynumber!=null and user.securitynumber != ''">
             and bu.securitynumber like concat('%', #{user.securitynumber},'%')
-        </if>
-        <if test="user.deptId!=null and user.deptId!=''">
-            and bu.dept_id =#{user.deptId}
         </if>
         <if test="user.startTime!=null and user.startTime!=''">
             and bu.paper_time &gt;= #{user.startTime}

--
Gitblit v1.9.3