diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java index 877faaa0..6bbb3ff0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java @@ -543,7 +543,8 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService { if (holidayBalanceSettingDO.getType() == 1) { for (AdminUserDO user : users) { if (user.getEntryDate() == null) { - continue; + user.setEntryDate(user.getCreateTime()); +// continue; } List theDayOfEachMonthSoFar = LocalDateTimeUtils.getTheDayOfEachMonthSoFar(user.getEntryDate(), now, holidayBalanceSettingDO.getIssueTimeType()); Map map = theDayOfEachMonthSoFar.stream() @@ -556,7 +557,8 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService { } else if (holidayBalanceSettingDO.getType() == 2) { for (AdminUserDO user : users) { if (user.getEntryDate() == null) { - continue; + user.setEntryDate(user.getCreateTime()); +// continue; } List theDayOfEachMonthSoFar; if (holidayBalanceSettingDO.getIssueTimeType() == 1) { @@ -611,14 +613,16 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService { if (holidayBalanceSettingDO.getType() == 1) { for (AdminUserDO user : users) { if (user.getEntryDate() == null) { - continue; + user.setEntryDate(user.getCreateTime()); +// continue; } quotaMap.put(user.getId(), new BigDecimal(holidayBalanceSettingDO.getQuota().toString())); } } else if (holidayBalanceSettingDO.getType() == 2) { for (AdminUserDO user : users) { if (user.getEntryDate() == null) { - continue; + user.setEntryDate(user.getCreateTime()); +// continue; } if (holidayBalanceSettingDO.getQuotaRule() == 1) { // TODO: 2024/11/6 // -- actualWorkFlag 没有判断这个 - 暂时去掉