|
@@ -851,7 +851,7 @@ public class WorkerLogic {
|
|
|
|
|
|
Page<Policy> page = policyService.lambdaQuery()
|
|
|
.notIn(policyOrder == null && CollectionUtil.isNotEmpty(policyOrders), Policy::getId, policyIds)
|
|
|
- .ge(policyOrder != null, Policy::getEndTime, policyOrder.getEndTime())
|
|
|
+ .ge(policyOrder != null && policyOrder.getEndTime() != null, Policy::getEndTime, policyOrder.getEndTime())
|
|
|
.eq(Policy::getIsBuy, IsYesNoEnum.YES.getKey())
|
|
|
.le(Policy::getPolicyStartTime, new Date())
|
|
|
.ge(Policy::getEndTime, new Date())
|