From a6f8672fb06c6df3df0553a575813d8a137042dd Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Mar 2024 17:36:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E5=91=98=E5=AF=BC=E5=85=A5=20?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8F=B7=E4=B8=8D=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ITbMemberProjectSubitemService.java        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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 005317f0..a3e34c06 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
@@ -288,14 +288,16 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 				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,companyManagement.getId());
-					List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
-					if(CollectionUtils.isEmpty(listPayIncomeContract)){
-						errorMessage.add("第" + errorRowNum + "行：" + "合同号不存在");
+					if (StringUtils.isNotBlank(contractNum)){
+						subitem.setContractNum(contractNum);
+						// 合同编号验证
+						LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper<>();
+						queryPayIncomeContract.eq(PayIncomeContract::getContractNum,contractNum);
+						queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,companyManagement.getId());
+						List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
+						if(CollectionUtils.isEmpty(listPayIncomeContract)){
+							errorMessage.add("第" + errorRowNum + "行：" + "合同号不存在");
+						}
 					}
 				}
 				if (Objects.equals(paymentMethodInt, PayProjectCommon.CHARGE_WAY3)) {