From cff62ae0836df0799651abd462feabeb4644b742 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 22 Nov 2021 08:48:57 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 2 +-
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 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 30309b8..d1b2299 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1075,7 +1075,7 @@
u.dept_id
FROM
sys_performance p
- INNER JOIN blade_user u ON p.securityId = u.id WHERE 1=1
+ INNER JOIN blade_user u ON p.cardid = u.cardid WHERE 1=1
<if test="type!=null and type=='1'.toString()">
and to_days(p.time) = to_days(now())
</if>
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 abe9736..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 != ''">
--
Gitblit v1.9.3