From 4c69575084063c36bff8563c589ffb281f24abbc Mon Sep 17 00:00:00 2001 From: coolleave Date: Mon, 5 May 2025 16:53:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E4=BA=8B=E8=80=83=E5=8B=A4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=86=E6=9E=90=E5=8F=96=E6=B6=88del=3D0=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysOaAttendanceServiceImpl.java | 2 +- .../mapper/oa/SysOaAttendanceMapper.xml | 4 ++-- .../com/ruoyi/system/mapper/SysUserMapper.java | 8 ++++++++ .../ruoyi/system/service/ISysUserService.java | 1 + .../system/service/impl/SysUserServiceImpl.java | 16 ++++++++++++++++ .../resources/mapper/system/SysUserMapper.xml | 6 ++++++ 6 files changed, 34 insertions(+), 3 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java index b1eba9c..d92a03b 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java @@ -208,7 +208,7 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService { Date lastDay = getLastDay(time); List costDataList = new ArrayList<>(); for (Long userId : userIds) { - SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserById(userId), SysUserVo.class); + SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserByIdIncludingDel(userId), SysUserVo.class); SysOaAttendanceVo sysOaAttendanceVo = new SysOaAttendanceVo(); sysOaAttendanceVo.setUserId(sysUser.getUserId()); diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml index 535b714..7d39e79 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml @@ -164,14 +164,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sop.finish_time, sop.delivery, sop.guarantee, sop.introduction, sop.project_grade, sop.project_status, sop.contract_id, sop.invoice_name, sop.invoice_number, sop.invoice_address, sop.invoice_bank, sop.accessory, sop.bail,sop.is_postpone, sop.postpone_reason,sop.postpone_time FROM sys_user su - left join sys_oa_attendance soa on (su.user_id = soa.user_id and soa.del_flag='0' AND (soa.create_time BETWEEN #{firstDay} AND #{lastDay})) + left join sys_oa_attendance soa on (su.user_id = soa.user_id and (soa.create_time BETWEEN #{firstDay} AND #{lastDay})) left join sys_oa_project sop on soa.project_id = sop.project_id WHERE su.user_id IN #{userId} - and su.del_flag = '0' + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 66bcd4b..a0b6e68 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -98,6 +98,13 @@ public interface SysUserMapper extends BaseMapperPlus selectListAndNotDel(); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 462ddd1..9482f9f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -233,4 +233,5 @@ public interface ISysUserService { */ List selectUserList2(); + SysUser selectUserByIdIncludingDel(Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 4c8b54a..1b8974b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -171,6 +171,17 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return baseMapper.selectUserById(userId); } + /** + * 查询所有用户包括被删除的 + * + * @return 用户信息集合信息 + */ + @Override + public SysUser selectUserByIdIncludingDel(Long userId) { + return baseMapper.selectUserByIdIncludingDel(userId); + } + + @Override public SysUser selectUserByIdAndNotDelFlag(Long userId) { return baseMapper.selectUserByIdAndNotDelFlag(userId); @@ -494,6 +505,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return baseMapper.selectListAndNotDel(); } + + + + + @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId") @Override public String selectUserNameById(Long userId) { diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 88572d7..a5f4543 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -169,4 +169,10 @@ + + +