From 725f7297403dbd4672ae35630b129ffcf04dda1a Mon Sep 17 00:00:00 2001 From: aikai Date: Mon, 11 Nov 2024 09:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E7=94=A8=E6=88=B7=E7=9A=84=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=AE=BE=E7=BD=AE=E5=85=A5=E8=81=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=88=99=E7=94=A8=E7=B3=BB=E7=BB=9F=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HolidayUserRecordServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 没有判断这个 - 暂时去掉