From b23897d8e25c3fa7c2b93b0aa2feb9bb9d452c27 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 21 Nov 2023 16:51:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E7=BB=88=E5=AE=A1=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=85=B6=E4=BB=96=E5=BA=94=E6=94=B6=E5=8D=95=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E7=BB=84=E7=BB=87=E4=BC=98=E5=8C=96=20=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/finbillapplication/FinBillApplicationService.java | 1 +
 .../FinCollectionConfirmationService.java                     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index eaaa5dd287..80d7c44cdb 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -1391,6 +1391,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+        finBillApplication = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
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 f78a1dc0e8..9e2268b806 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
@@ -1828,8 +1828,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 customerNumber = busSalesOrderVehicle.getTemporaryNo();
                             }
                             creditResult.setCommUnit(customerNumber);
-                            SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(busSalesOrder.getUseOrgSid()).getData();
-                            creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+                            BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(busSalesOrder.getPurchaseSystemSid()).getData();
+                            creditResult.setCollectionOrg(basePurchaseSystemDetailsVo.getOrgCode());
                             creditResult.setBussDate(DateUtil.formatDate(new Date()));
                             List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
                             SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData();