Merge remote-tracking branch 'origin/main'

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "java.compile.nullAnalysis.mode": "automatic"
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "interactive"
 }

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) {

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));
             }

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>