From 4a7795dc0b0b9a9ccd114d9451cef8a9a9cfdf2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Fri, 22 Oct 2021 13:51:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40457?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayContactsManagementController.java      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 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 031b6ba9..5dfd5050 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
@@ -706,6 +706,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 					List<PayContactsManagement> listSigning = new ArrayList<>();
 					List<PayContactsManagement> listRemove = new ArrayList<>();
 					List<String> phoneList = new ArrayList<>();
+					List<String> contactsList = new ArrayList<>();
 					List<String> companyList = new ArrayList<>();
 							list.forEach(p->{
 						if(!StringUtils.isEmpty(p.getPhone())){
@@ -714,11 +715,20 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 						if(!StringUtils.isEmpty(p.getCompanyName())){
 							companyList.add(p.getCompanyName());
 						}
+						if(!StringUtils.isEmpty(p.getName())){
+							contactsList.add(p.getName());
+						}
 					});
 					List<PayContactsManagement> listContactsAll = new ArrayList<>();
 					if(!CollectionUtils.isEmpty(phoneList)){
 						listContactsAll = payContactsManagementService.listPayContactsManagement(phoneList);
 					}
+					List<PayContactsManagement> listContactsNameAll = new ArrayList<>();
+					if(!CollectionUtils.isEmpty(contactsList)){
+						LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
+						queryPayContactsManagement.in(PayContactsManagement::getName,contactsList);
+						listContactsNameAll = payContactsManagementService.list(queryPayContactsManagement);
+					}
 					List<PayCompanyManagement> listCompanyAll = new ArrayList<>();
 					if(!CollectionUtils.isEmpty(companyList)){
 						listCompanyAll = payCompanyManagementService.listPayCompanyManagement(companyList);
@@ -726,6 +736,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 					List<PayContactsManagement> listContacts = new ArrayList<>();
 					List<PayCompanyManagement> finalListCompanyAll = listCompanyAll;
 					List<PayContactsManagement> finalListContactsAll = listContactsAll;
+					List<PayContactsManagement> finalListContactsNameAll = listContactsNameAll;
 					list.forEach(p->{
 						int count = list.indexOf(p);
 						// 校验excel表中是否存在重复手机号
@@ -767,10 +778,12 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 							if(!CollectionUtils.isEmpty(listCompanyEquals)){
 								msg.append("第").append(count + 3).append("行:手机号已经存在，请修改。<br/>");
 							}
-							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(finalListContactsNameAll) && !StringUtils.isEmpty(p.getCompanyId())){
+							List<PayContactsManagement> listContactsEquals = finalListContactsNameAll.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("行:").append("该企业下姓名已经存在，请修改。<br/>");
 							}
 						}
 						if (!StringUtils.isBlank(p.getPhone())){