diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java index 765cb6ed..471a651d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java @@ -680,10 +680,10 @@ public class AttendanceServiceImpl implements AttendanceService { if (AttendanceOnTheDayDTO.PUNCH_STATUS_MISS.equals(attendancePunchRecordDO.getStatus())) { punchStatusMissNum++; } - if (AttendanceOnTheDayDTO.PUNCH_STATUS_LEAVE_EARLY.equals(attendancePunchRecordDO.getStatus())) { + if (AttendanceOnTheDayDTO.PUNCH_STATUS_LATE.equals(attendancePunchRecordDO.getStatus())) { lateNum++; } - if (AttendanceOnTheDayDTO.PUNCH_STATUS_LATE.equals(attendancePunchRecordDO.getStatus())) { + if (AttendanceOnTheDayDTO.PUNCH_STATUS_LEAVE_EARLY.equals(attendancePunchRecordDO.getStatus())) { leaveEarlyNum++; } if (Constants.TRUE.equals(attendancePunchRecordDO.getFieldServiceFlag())) { @@ -868,7 +868,12 @@ public class AttendanceServiceImpl implements AttendanceService { public List getTheAttendanceGroupToWhichTheCurrentlyLoggedInUserBelongsAndWhetherTheyHaveAdministratorRights(Boolean allFlag) { Long userId = getLoginUserId(); List attendanceGroupSystemVOS = new ArrayList<>(); - List attendanceGroupDOS = attendanceGroupSystemService.getGroupSystemByUserId(userId); + List attendanceGroupDOS = new ArrayList<>(); + if (allFlag) { + attendanceGroupDOS = attendanceGroupMapper.selectList(); + } else { + attendanceGroupDOS = attendanceGroupSystemService.getGroupSystemByUserId(userId); + } if (CollectionUtil.isEmpty(attendanceGroupDOS)) { return attendanceGroupSystemVOS; }