From bb771e7e29dedf6816be50fe247373f2661008f0 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Mar 2024 10:32:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=2083202=20=E4=BC=9A=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=AF=BC=E5=85=A5--=E5=AD=98=E5=9C=A8=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=8F=B7=E5=8D=B4=E6=8A=A5=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=A6=E5=A4=96=E5=A2=9E=E5=8A=A0=E4=BD=8D=E6=95=B0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/service/ITbMemberProjectSubitemService.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index 6c3a5e1a..1721915c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -213,8 +213,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 			errorMessage.addAll(errorList);
 
 			String companyName = subitemExcel.getCompanyId();
+			PayCompanyManagement companyManagement = null;
 			if (StringUtils.isNotBlank(companyName)){
-				PayCompanyManagement companyManagement = companyManagementService.getCompanyByName(companyName);
+				companyManagement = companyManagementService.getCompanyByName(companyName);
 				if (companyManagement == null){
 					errorMessage.add("第" + errorRowNum + "行：" + "会员单位不存在");
 				}else if(companyNameList.contains(companyName)){
@@ -284,14 +285,14 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 				int paymentMethodInt = Integer.parseInt(paymentTypeMap.get(paymentMethod));
 				subitem.setPaymentMethod(paymentMethodInt);
 
-				if (Objects.equals(paymentMethodInt, PayProjectCommon.CHARGE_WAY2)) {
+				if (companyManagement != null && Objects.equals(paymentMethodInt, PayProjectCommon.CHARGE_WAY2)) {
 					errorMessage.addAll(ValidUtil.validateReturnListWithNum(subitemExcel,errorRowNum, Contract.class));
 					String contractNum = subitemExcel.getContractNum();
 					subitem.setContractNum(contractNum);
 					// 合同编号验证
 					LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper<>();
 					queryPayIncomeContract.eq(PayIncomeContract::getContractNum,contractNum);
-					queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,subitemExcel.getCompanyId());
+					queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,companyManagement.getId());
 					List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
 					if(CollectionUtils.isEmpty(listPayIncomeContract)){
 						errorMessage.add("第" + errorRowNum + "行：" + "合同号不存在");