From a647bc8a43c0212f482bee0630ebd14dca120a8a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 28 九月 2026 14:13:28 +0800
Subject: [PATCH] feat: CRM 发票/合同导入、MES 质检批量导入与检测台账、回款与报价校验、权限码细化
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java
index 44c03af..c675ee3 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java
@@ -13,7 +13,7 @@
/**
* 鑰冨嫟鑺傚亣鏃ラ厤缃� Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface HrmAttendanceHolidayMapper extends BaseMapperX<HrmAttendanceHolidayDO> {
@@ -22,7 +22,8 @@
return selectPage(reqVO, new LambdaQueryWrapperX<HrmAttendanceHolidayDO>()
.likeIfPresent(HrmAttendanceHolidayDO::getName, reqVO.getName())
.eqIfPresent(HrmAttendanceHolidayDO::getType, reqVO.getType())
- .betweenIfPresent(HrmAttendanceHolidayDO::getDate, reqVO.getStartDate(), reqVO.getEndDate())
+ .eqIfPresent(HrmAttendanceHolidayDO::getIsLegal, reqVO.getIsLegal())
+ .betweenIfPresent(HrmAttendanceHolidayDO::getDate, reqVO.getDate())
.orderByDesc(HrmAttendanceHolidayDO::getDate));
}
--
Gitblit v1.9.3