fix:支付科目查询没停用的

src/main/java/cn/ezhizao/project/business/payment/controller/BizPaymentController.java

@@ -186,6 +186,7 @@ public class BizPaymentController extends BaseController {
         setTenantId(typeConditions);
         List<BizPaymentType> list = paymentTypeService.getList(typeConditions);
         BizPaymentSubject subjectConditions = new BizPaymentSubject();
+        subjectConditions.setStatus(0);
         List<BizPaymentSubject> subjects = paymentSubjectService.getList(subjectConditions);
         list.forEach(l -> {
             l.setBizPaymentSubjectList(subjects.stream().filter(v -> v.getPaymentTypeId().equals(l.getId())).collect(Collectors.toList()));
@@ -257,7 +258,19 @@ public class BizPaymentController extends BaseController {
                 detail.setReallyAmount(bigDecimal);
             }
         }
-        List<BizPayment> paymentList = paymentService.list(new LambdaQueryWrapper<BizPayment>().eq(BizPayment::getContractId, contractId).eq(BizPayment::getPaymentStatus, 1).eq(BizPayment::getVerifyStatus, 3));
+        List<BizPayment> paymentList = paymentService.list(new LambdaQueryWrapper<BizPayment>()
+                .eq(BizPayment::getContractId, contractId)
+                        .and(item ->
+                        item.eq(BizPayment::getPaymentStatus,0)
+                        .or()
+                        .eq(BizPayment::getPaymentStatus,1)
+                        .or()
+                        .eq(BizPayment::getVerifyStatus,0)
+                        .or()
+                        .eq(BizPayment::getVerifyStatus,1)
+                        .or()
+                        .eq(BizPayment::getVerifyStatus,3)
+                        ));
         List<Long> idList = paymentList.stream().map(m -> m.getId()).collect(Collectors.toList());
         if (idList.size() > 0) {
             List<BizPaymentDetail> bizPaymentDetailList = paymentDetailService.list(new LambdaQueryWrapper<BizPaymentDetail>().in(BizPaymentDetail::getPaymentId, idList));