From cdbc98a05352a97d06e9df19c77cc096f9899aaf Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 30 Jul 2024 11:16:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087752=20=E5=B9=B4=E5=BA=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=94=81=E5=AE=9A--=E6=96=B0=E5=A2=9E=E9=80=89?=
 =?UTF-8?q?=E6=8B=A92020=E5=B9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/project/service/AnnualDataLockingService.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java
index 9e899a5f..6f4d2c85 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java
@@ -124,6 +124,10 @@ public class AnnualDataLockingService extends ServiceImpl<AnnualDataLockingMappe
         //获得去重后的所有企业和联系人（联系人和邮寄联系人）
         ArrayList<String> distinctCompanyIdList = getDistinctCompanyIdList(meetingSituations, workingGroupSubItems, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems,packCompanyList);
         ArrayList<String> distinctContactIdList = getDistinctContactIdList(meetingSituations, workingGroupSubItems, workingGroupSubItemContacts, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems,packCompanyList);
+        //如果企业或联系人为空那么直接返回
+        if (CollectionUtil.isEmpty(distinctCompanyIdList)||CollectionUtil.isEmpty(distinctContactIdList)){
+            return;
+        }
         //生成企业和联系人临时数据
         List<PayCompanyManagementTemporary> companyTemporaryList = companyTemporaryService.insertList(distinctCompanyIdList,year);
         Map<String, PayCompanyManagementTemporary> companyTemporaryMap = CollStreamUtil.toIdentityMap(companyTemporaryList, PayCompanyManagementTemporary::getCompanyId);