From a4a10653acb8a7f86aa8c671c4b4b75e8d961b6c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 15:21:48 +0800
Subject: [PATCH] 修复考勤汇总生成与新增节假日报错
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java
index d894d4c..def4bd1 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceHolidayServiceImpl.java
@@ -36,9 +36,7 @@
validateDateRangeNoOverlap(createReqVO.getStartDate(), createReqVO.getEndDate(), null);
HrmAttendanceHolidayDO attendanceHoliday = BeanUtils.toBean(createReqVO, HrmAttendanceHolidayDO.class);
attendanceHoliday.setDate(createReqVO.getStartDate());
- if (attendanceHoliday.getIsLegal() == null) {
- attendanceHoliday.setIsLegal(0);
- }
+ attendanceHoliday.setIsLegal(Boolean.TRUE.equals(createReqVO.getIsLegal()) ? 1 : 0);
attendanceHolidayMapper.insert(attendanceHoliday);
return attendanceHoliday.getId();
}
@@ -50,6 +48,7 @@
validateDateRangeNoOverlap(updateReqVO.getStartDate(), updateReqVO.getEndDate(), updateReqVO.getId());
HrmAttendanceHolidayDO updateObj = BeanUtils.toBean(updateReqVO, HrmAttendanceHolidayDO.class);
updateObj.setDate(updateReqVO.getStartDate());
+ updateObj.setIsLegal(Boolean.TRUE.equals(updateReqVO.getIsLegal()) ? 1 : 0);
attendanceHolidayMapper.updateById(updateObj);
}
--
Gitblit v1.9.3