|
|
@@ -114,7 +114,7 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
|
|
|
.or().between(KwcContractLogistics::getEndTime, startTime, endTime)
|
|
|
.or(queryWrapper1->queryWrapper1.le(KwcContractLogistics::getStartTime, startTime).ge(KwcContractLogistics::getEndTime, endTime))
|
|
|
// 结束日期为空,代表长期有效
|
|
|
- //.or(queryWrapper2->queryWrapper2.ge(KwcContractLogistics::getStartTime, endTime).isNull(KwcContractLogistics::getEndTime))
|
|
|
+ .or(queryWrapper2->queryWrapper2.ge(KwcContractLogistics::getStartTime, endTime).isNull(KwcContractLogistics::getEndTime))
|
|
|
));
|
|
|
}
|
|
|
|