diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java index 0b1c993..12b71cd 100644 --- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java +++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java @@ -29,6 +29,8 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.time.YearMonth; +import java.time.temporal.TemporalAdjuster; +import java.time.temporal.TemporalAdjusters; import java.util.*; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadPoolExecutor; @@ -408,6 +410,7 @@ public class SalaryCalcService { .eq(SalaryGroupUser::getProbationer, Boolean.TRUE) .eq(SalaryGroupUser::getFrozen, Boolean.FALSE) .eq(SalaryGroupUser::getYn, Boolean.TRUE) + .ge(SalaryGroupUser::getDataDate, user.getDataDate().with(TemporalAdjusters.firstDayOfMonth())) .le(SalaryGroupUser::getDataDate, user.getDataDate()) ); if (count <= 0) {