From bda2a80ffb10b1272125c3e2c4987dfd6eea8960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Tue, 12 Oct 2021 15:55:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40452,#40448?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayContactsManagementController.java      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index 94d28035..82264195 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -737,17 +737,18 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 						}
 						if(StringUtils.isEmpty(p.getCompanyName())){
 							msg.append("第 ").append(count + 3).append(" 行：企业名称不能为空，请修改。<br/>");
-						}
-						// 根据企业名称获取企业id
-						if(!CollectionUtils.isEmpty(finalListCompanyAll)){
-							List<PayCompanyManagement> listCompany = finalListCompanyAll.stream().filter(p2->Objects.equals(p2.getCompanyName(),p.getCompanyName())).collect(Collectors.toList());
-							if(!CollectionUtils.isEmpty(listCompany)){
-								p.setCompanyId(listCompany.get(0).getId());
+						}else{
+							// 根据企业名称获取企业id
+							if(!CollectionUtils.isEmpty(finalListCompanyAll)){
+								List<PayCompanyManagement> listCompany = finalListCompanyAll.stream().filter(p2->Objects.equals(p2.getCompanyName(),p.getCompanyName())).collect(Collectors.toList());
+								if(!CollectionUtils.isEmpty(listCompany)){
+									p.setCompanyId(listCompany.get(0).getId());
+								}else{
+									msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。<br/>");
+								}
 							}else{
 								msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。<br/>");
 							}
-						}else{
-							msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。<br/>");
 						}
 						// 校验 手机号，姓名
 						if(!CollectionUtils.isEmpty(finalListContactsAll)){
@@ -759,7 +760,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 							List<PayContactsManagement> listContactsEquals = finalListContactsAll.stream().filter(p1->Objects.equals(p1.getCompanyId(),p.getCompanyId())
 								&& Objects.equals(p1.getName(),p.getName())).collect(Collectors.toList());
 							if(!CollectionUtils.isEmpty(listContactsEquals)){
-								msg.append("第").append(count + 3).append("行：联系人姓名已经存在，请修改。<br/>");
+								msg.append("第").append(count + 3).append("行：姓名已经存在，请修改。<br/>");
 							}
 						}
 						if (!StringUtils.isBlank(p.getPhone())){