From 1b1703b01c577b99d4c974e7f949fb463311fedc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 18 Oct 2021 16:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40877?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayIncomeContractServiceImpl.java    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
index 55d11600..21436a61 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
@@ -810,18 +810,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
      * @Exception
      */
     private void setPayIncomeContractEdit(PayIncomeContract payIncomeContract,PayIncomeContract payIncomeContractStatus){
-        if(!Objects.equals(payIncomeContractStatus.getSignedCompanyTemporaryId(),payIncomeContract.getSignedCompanyId())){
-            // 企业
-            PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payIncomeContract.getSignedCompanyId());
-            if(Objects.isNull(chargeCompanyName)){
-                throw new JeroBootException("企业名称为空！");
-            }
-            payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
-            payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
-            payCompanyManagementTemporaryService.removeById(payIncomeContract.getSignedCompanyTemporaryId());
-        }else{
-            payIncomeContract.setSignedCompanyId(payIncomeContractStatus.getSignedCompanyId());
-        }
+//        if(!Objects.equals(payIncomeContractStatus.getSignedCompanyTemporaryId(),payIncomeContract.getSignedCompanyId())){
+//            // 企业
+//            PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payIncomeContract.getSignedCompanyId());
+//            if(Objects.isNull(chargeCompanyName)){
+//                throw new JeroBootException("企业名称为空！");
+//            }
+//            payIncomeContract.setSignedCompanyTemporaryId(chargeCompanyName.getId());
+//            payIncomeContract.setSignedCompanyTemporaryName(chargeCompanyName.getCompanyName());
+//            payCompanyManagementTemporaryService.removeById(payIncomeContractStatus.getSignedCompanyTemporaryId());
+//        }else{
+//            payIncomeContract.setSignedCompanyId(payIncomeContractStatus.getSignedCompanyId());
+//        }
 
         if(!Objects.equals(payIncomeContractStatus.getSignedContactsTemporaryId(),payIncomeContract.getSignedContactsId())){
             // 联系人
@@ -831,7 +831,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             }
             payIncomeContract.setSignedContactsTemporaryId(contactsName.getId());
             payIncomeContract.setSignedContactsTemporaryName(contactsName.getName());
-            payContactsManagementTemporaryService.removeById(payIncomeContract.getSignedContactsTemporaryId());
+            payContactsManagementTemporaryService.removeById(payIncomeContractStatus.getSignedContactsTemporaryId());
         }else{
             payIncomeContract.setSignedContactsId(payIncomeContractStatus.getSignedContactsId());
         }