From 8552119fd4664f6693121f77b31e5f76a0efc20d Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Thu, 4 Sep 2025 15:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E5=B0=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                                         | 3 ++-
 .../com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java | 1 +
 .../java/com/ruoyi/system/service/impl/SysOssServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/system/SysUserMapper.xml        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7b016a8..e012065 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "java.compile.nullAnalysis.mode": "automatic"
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "interactive"
 }
\ No newline at end of file
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 7b2a3a7..7fd5b1c 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
@@ -232,6 +232,7 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
         // 开始写入
         for (Long userId : workerIds) {
             SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserByIdIncludingDel(userId), SysUserVo.class);
+
             SysOaAttendanceVo sysOaAttendanceVo = new SysOaAttendanceVo();
             //如果sysUser为空就跳过
             if (sysUser == null) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
index bffb501..8ecd608 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
@@ -61,7 +61,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     public List<SysOssVo> listByIds(Collection<Long> ossIds) {
         List<SysOssVo> list = new ArrayList<>();
         for (Long id : ossIds) {
-            SysOssVo vo = SpringUtils.getAopProxy(this).getById(id);
+            SysOssVo vo = baseMapper.selectVoById(id);
             if (ObjectUtil.isNotNull(vo)) {
                 list.add(this.matchingUrl(vo));
             }
@@ -104,7 +104,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
 
     @Override
     public void download(Long ossId, HttpServletResponse response) throws IOException {
-        SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId);
+        SysOssVo sysOss = baseMapper.selectVoById(ossId);
         if (ObjectUtil.isNull(sysOss)) {
             throw new ServiceException("文件数据不存在!");
         }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index dcaa5cf..efd1441 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -208,7 +208,7 @@
 
 
     <select id="selectListAndNotDel" resultMap="ClearUser">
-        select user_id,user_name, u.insure,nick_name,labor_cost from sys_user where del_flag ='0'
+        select user_id,user_name,insure,nick_name,labor_cost from sys_user where del_flag ='0'
     </select>