From 48679fc5bb7e8dc8b8d45a5d2373bd11dc612413 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Nov 2021 10:02:27 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 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..4e35814 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -156,9 +156,9 @@
sys_information si
on
si.departmentid = bu.dept_id
- LEFT JOIN sys_performance p ON p.departmentid = bu.dept_id
LEFT JOIN blade_dept d ON bu.dept_id = d.id
LEFT JOIN sys_jurisdiction j ON j.id = si.jurisdiction
+ LEFT JOIN sys_performance p ON p.cardid = bu.cardid
where bu.is_deleted = 0
and bu.status = 1
<if test="user.realName!=null and user.realName != ''">
@@ -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 >= #{user.startTime}
--
Gitblit v1.9.3