修改是否有效查询条件

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -108,8 +108,13 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         //是否有效  1失效  2 有效
         if (agreementProductQueryVo.getIsEffective() != null) {
             if (agreementProductQueryVo.getIsEffective().equals("1")) {
-                ptlAgreementProductCostsNewLambdaQueryWrapper.gt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
-                        .lt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now());
+                ptlAgreementProductCostsNewLambdaQueryWrapper.and(
+                        query -> query.gt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
+                                .or()
+                                .lt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now())
+                );
+//                ptlAgreementProductCostsNewLambdaQueryWrapper.gt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
+//                        .lt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now());
             } else if (agreementProductQueryVo.getIsEffective().equals("2")) {
                 ptlAgreementProductCostsNewLambdaQueryWrapper.lt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
                         .gt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now());