Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -700,6 +700,8 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                 GeneralVoucher generalVoucher = new GeneralVoucher();
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
                 for (LoanPlanDetailsVoForLateVoucher planDetails : records) {
+                    if (StringUtils.isNotBlank(planDetails.getOverdueState())) {
+                        if (planDetails.getOverdueState().equals("0")) {
                             if (null != planDetails) {
                                 planSids.add(planDetails.getPlanSid());
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
@@ -766,9 +768,13 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                                 voucherDetails.add(voucherDetail);
                             }
                         }
+                    }
+                }
+                if (!voucherDetails.isEmpty()) {
                     generalVoucher.setVoucherDetails(voucherDetails);
                     finKingDeeFeign.saveLateVoucher(generalVoucher);
                 }
+            }
             if (!planSids.isEmpty()) {
                 int i = loanRepaymentPlanDetailsService.updateOweState(planSids);
             }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java

@@ -88,6 +88,8 @@ public class ScheduledRepaymentPlanDetailsService {
                     GeneralVoucher generalVoucher = new GeneralVoucher();
                     List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
                     for (LoanPlanDetailsVoForLateVoucher planDetails : records) {
+                        if (StringUtils.isNotBlank(planDetails.getOverdueState())) {
+                            if (planDetails.getOverdueState().equals("0")) {
                                 if (null != planDetails) {
                                     planSids.add(planDetails.getPlanSid());
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
@@ -173,9 +175,13 @@ public class ScheduledRepaymentPlanDetailsService {
                                     voucherDetails.add(voucherDetail);
                                 }
                             }
+                        }
+                    }
+                    if (!voucherDetails.isEmpty()) {
                         generalVoucher.setVoucherDetails(voucherDetails);
                         finKingDeeFeign.saveLateVoucher(generalVoucher);
                     }
+                }
                 if (!planSids.isEmpty()) {
                     int i = loanRepaymentPlanDetailsService.updateOweState(planSids);
                 }