From ab96a990a62c04fce44c8c3f5cdf07e7b0baa31f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 30 Jul 2024 11:02:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayCompanyManagementTemporaryServiceImpl.java     | 11 +++++++++++
 .../PayContactsManagementTemporaryServiceImpl.java    |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java
index 20fbefd8..c8752e11 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java
@@ -106,6 +106,14 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl<PayCom
             temporary = JSON.parseObject(str, PayCompanyManagementTemporary.class);
         }else {
             temporary = this.getById(companyTemporaryId);
+            if (temporary == null){
+                PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(companyId);
+                if(Objects.equals(payCompanyManagement.getStatus(), PayCompanyManagementTemporaryCommon.STATUS2)){
+                    payCompanyManagement.setCompanyName(payCompanyManagement.getCompanyName() + PayCompanyManagementTemporaryCommon.CHECK);
+                }
+                String str = JSONObject.toJSONString(payCompanyManagement);
+                temporary = JSON.parseObject(str, PayCompanyManagementTemporary.class);
+            }
         }
         return temporary;
     }
@@ -116,6 +124,9 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl<PayCom
         temporary = baseMapper.selectById(id);
         if (temporary == null){
             PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(id);
+            if (payCompanyManagement == null){
+                return null;
+            }
             if(Objects.equals(payCompanyManagement.getStatus(), PayCompanyManagementTemporaryCommon.STATUS2)){
                 payCompanyManagement.setCompanyName(payCompanyManagement.getCompanyName() + PayCompanyManagementTemporaryCommon.CHECK);
             }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java
index 9e256974..94070164 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java
@@ -93,6 +93,11 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl<PayCo
             temporary = JSON.parseObject(str, PayContactsManagementTemporary.class);
         }else {
             temporary = this.getById(contactsTemporaryId);
+            if (temporary == null){
+                PayContactsManagement contactsManagement = payContactsManagementService.getById(contactsId);
+                String str = JSONObject.toJSONString(contactsManagement);
+                temporary = JSON.parseObject(str, PayContactsManagementTemporary.class);
+            }
         }
         return temporary;
     }