From 5c290b9f4cbe7ea1c5e643c5b26c9f53b3b92ba8 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 12 May 2025 09:47:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 94377bc4d4..41b1ef6e93 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -4742,8 +4742,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         String customerNumber = "";
         for (int i = 0; i < finSelectedReceivablesDetailedVoList.size(); i++) {
             FinSelectedReceivablesDetailedVo v = finSelectedReceivablesDetailedVoList.get(i);
-            FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid());
-            LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(finUncollectedReceivablesDetailedJR.getBusSid()).getData();
+            String planSid = "";
+            if (v.getReceivablesName().equals("月还")) {
+                planSid = v.getReceivablesSid();
+            } else {
+                FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid());
+                if (jr != null) {
+                    planSid = jr.getBusSid();
+                }
+            }
+            LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData();
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
             BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
             if (salesOrder != null && busSalesOrderVehicle != null) {