From ab9503faf6ec59772376aac56425d1bb3928fb3d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 29 Jul 2024 15:04:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087671=20=E5=9B=BD=E9=99=85=E7=A0=94?=
 =?UTF-8?q?=E8=AE=A8=E4=BC=9A-=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8-=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 71a94f72..137a0bf0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -1768,7 +1768,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         String meetingType1 = getMeetingType(payMeetingSituation);
         List<Object> exportList = new ArrayList<>();
         for (PayMeetingSituation meetingSituation : pageList) {
-
+            String companyId = meetingSituation.getCompanyId();
+            String companyTemporaryId = meetingSituation.getCompanyTemporaryId();
             String companyContactId = meetingSituation.getCompanyContactId();
             String companyContactTemporaryId = meetingSituation.getCompanyContactTemporaryId();
             PayContactsManagementTemporary contactsManagement = contactsManagementTemporaryService.getByAllTable(companyContactId, companyContactTemporaryId);
@@ -1778,7 +1779,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }
             meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
             meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
-            PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId());
+            PayCompanyManagementTemporary companyManagement = companyManagementTemporaryService.getByAllTable(companyId, companyTemporaryId);
             meetingSituation.setCompanyName(companyManagement.getCompanyName());
             String checkFile = meetingSituation.getCheckFile();
             if (StringUtils.isNotBlank(checkFile)) {