Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-12-05 16:59:48 +08:00
commit fa0c9f0f61
1 changed files with 0 additions and 4 deletions

View File

@ -219,9 +219,6 @@ public class TAbilityApplicationController {
index.setDoneReminders(Boolean.FALSE); // 不存在催办记录
index.setNextRemindersDays(0); // 距离下次催办天数为0
}
// index.setAllowReminders(Boolean.TRUE); // 允许催办
// index.setDoneReminders(Boolean.FALSE); // 不存在催办记录
// index.setNextRemindersDays(0); // 距离下次催办天数为0
} else { // 进行过催办
long between = ChronoUnit.DAYS.between(localDate, LocalDate.now()); // 上次催办距离今天已过天数
if (between <= interval) { // 间隔天数小于限制天数
@ -239,7 +236,6 @@ public class TAbilityApplicationController {
index.setDoneReminders(Boolean.FALSE);
index.setNextRemindersDays(0);
}
return index;
}).collect(Collectors.toList());
page.setList(list);