diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/vo/AttendancePunchPageVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/vo/AttendancePunchPageVO.java index 2e6113d8..15676f9e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/vo/AttendancePunchPageVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/vo/AttendancePunchPageVO.java @@ -77,13 +77,14 @@ public class AttendancePunchPageVO { /** * 处理加班打卡 不计算是否迟到早退 + * * @param punchType */ public void setPunchType(Integer punchType) { - if (this.getFieldworkFlag() == 0) { + if (this.getWorkOvertimeFlag() == 0) { this.punchType = punchType; } else { - this.punchType = Arrays.asList(0, 2).contains(punchType) ? 0 : 1; + this.punchType = Arrays.asList(0, 2).contains(punchType) ? 0 : (Arrays.asList(1, 3).contains(punchType) ? 1 : 4); } } }