From 0912ce936461c296303da46e0f9aa83041df5f36 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 16 Jan 2023 14:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/biz/basevehicleout/BaseVehicleOutService.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index a7b66f0ee8..3f539c39f3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -103,7 +103,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         String vinSid = dto.getVinSid();
         BdCustomer bdCustomer = new BdCustomer();
         String payTypeKey = "";
-        SysOrganizationVo sysOrganizationVo = null;
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid);
         //判断车辆是否存在流程中的销售订单
         List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vinSid).getData();
@@ -124,7 +124,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 if (data != null){
                     bdCustomer.setTOrgIds(data.getOrgCode());
                 }else {
-                    sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
                     bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
                 }
                 bdCustomer.setFName(dto.getCustomerName() + dto.getMobile());
@@ -144,7 +143,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     if (data != null){
                         bdCustomer.setTOrgIds(data.getOrgCode());
                     }else {
-                        sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
                         bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
                     }
                     bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
@@ -173,7 +171,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (data != null){
                 bdCustomer.setTOrgIds(data.getOrgCode());
             }else {
-                sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
                 bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
             }
             bdCustomers.add(bdCustomer);
@@ -536,6 +533,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     public ResultBean isUpdateOrInsertCrm(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String isUpdateOrInsertCrm = dto.getIsUpdateOrInsertCrm();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
         List<BdCustomer> bdCustomers = new ArrayList<>();
         BdCustomer bdCustomer = new BdCustomer();
         if ("是".equals(isUpdateOrInsertCrm)) {
@@ -546,7 +544,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             } else {
                 bdCustomer.setFNumber(FNumber);
             }
-            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
             bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
             bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
             bdCustomer.setOldFNumber(dto.getCustomerNo());
@@ -554,7 +551,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             bdCustomers.add(bdCustomer);
             finKingDeeFeign.saveBdCustomers(bdCustomers);
         } else if ("否".equals(isUpdateOrInsertCrm)) {
-            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
             bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
             bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
             String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);