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");
- }
- // 根据企业名称获取企业id
- if(!CollectionUtils.isEmpty(finalListCompanyAll)){
- List 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 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(" 行:企业名称不存在,请修改。
");
+ }
}else{
msg.append("第 ").append(count + 3).append(" 行:企业名称不存在,请修改。
");
}
- }else{
- msg.append("第 ").append(count + 3).append(" 行:企业名称不存在,请修改。
");
}
// 校验 手机号,姓名
if(!CollectionUtils.isEmpty(finalListContactsAll)){
@@ -759,7 +760,7 @@ public class PayContactsManagementController extends JeroController 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("行:联系人姓名已经存在,请修改。
");
+ msg.append("第").append(count + 3).append("行:姓名已经存在,请修改。
");
}
}
if (!StringUtils.isBlank(p.getPhone())){