Merge remote-tracking branch 'origin/main'

2025-09-06 15:40:29 +08:00
parent f5ee618454 8552119fd4
commit 53d543c285
4 changed files with 5 additions and 3 deletions
--- 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) {