From 201ba42b9c1e2b2de0a020ecc727f84eb3111542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 8 Jan 2024 16:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=B7=E8=8D=89=E7=BB=84?=
 =?UTF-8?q?=E5=88=86=E5=8F=91=E8=B5=84=E6=96=99=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayDraftingGroupSubItemContactsServiceImpl.java   | 5 ++++-
 .../PayWorkingGroupDistributionRecordController.java       | 1 -
 .../impl/PayWorkingGroupSubItemContactsServiceImpl.java    | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java
index 90f40a06..953c2ce5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -40,7 +41,9 @@ public class PayDraftingGroupSubItemContactsServiceImpl extends ServiceImpl<PayD
         for (PayDraftingGroupSubItemContacts subItemContacts : listPayDraftingGroupSubItemContacts) {
             String contactsTemporaryId = subItemContacts.getContactsTemporaryId();
             PayContactsManagementTemporary payContactsManagementTemporary = collectMap.get(contactsTemporaryId);
-            subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName());
+            if(!Objects.isNull(payContactsManagementTemporary)) {
+                subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName());
+            }
         }
         return listPayDraftingGroupSubItemContacts;
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
index 91171183..a79c52a7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
@@ -256,7 +256,6 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
 					 listData.add(payContactsManagement);
 				 });
 			 }
-
 		 }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4)){
 			 List<PayDraftingGroupSubItemContacts> list = payDraftingGroupSubItemContactsService.getContactsInfo(projectId);
 			 if(!CollectionUtils.isEmpty(list)){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java
index 670c86c1..38e2433a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java
@@ -1,6 +1,5 @@
 package com.jero.project.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.project.entity.PayWorkingGroupSubItemContacts;
@@ -13,6 +12,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -40,7 +40,10 @@ public class PayWorkingGroupSubItemContactsServiceImpl extends ServiceImpl<PayWo
         for (PayWorkingGroupSubItemContacts subItemContacts : listPayWorkingGroupSubItemContacts) {
             String contactsTemporaryId = subItemContacts.getContactsTemporaryId();
             PayContactsManagementTemporary payContactsManagementTemporary = collectMap.get(contactsTemporaryId);
-            subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName());
+            if(!Objects.isNull(payContactsManagementTemporary)){
+                subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName());
+            }
+
         }
         return listPayWorkingGroupSubItemContacts;
     }