LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug#40452,#40448

Browse Source
This commit is contained in:
梁琦涛
2021-10-12 15:55:45 +08:00
parent 56724b91b4
commit bda2a80ffb
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+10 -9
View File
@@ -737,17 +737,18 @@ public class PayContactsManagementController extends JeroController<PayContactsM
} }
if(StringUtils.isEmpty(p.getCompanyName())){ if(StringUtils.isEmpty(p.getCompanyName())){
msg.append("第 ").append(count + 3).append(" 行：企业名称不能为空，请修改。<br/>"); msg.append("第 ").append(count + 3).append(" 行：企业名称不能为空，请修改。<br/>");
} }else{
// 根据企业名称获取企业id // 根据企业名称获取企业id
if(!CollectionUtils.isEmpty(finalListCompanyAll)){ if(!CollectionUtils.isEmpty(finalListCompanyAll)){
List<PayCompanyManagement> listCompany = finalListCompanyAll.stream().filter(p2->Objects.equals(p2.getCompanyName(),p.getCompanyName())).collect(Collectors.toList()); List<PayCompanyManagement> listCompany = finalListCompanyAll.stream().filter(p2->Objects.equals(p2.getCompanyName(),p.getCompanyName())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listCompany)){ if(!CollectionUtils.isEmpty(listCompany)){
p.setCompanyId(listCompany.get(0).getId()); p.setCompanyId(listCompany.get(0).getId());
}else{
msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。<br/>");
}
}else{ }else{
msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。<br/>"); msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。<br/>");
} }
}else{
msg.append("第 ").append(count + 3).append(" 行：企业名称不存在，请修改。<br/>");
} }
// 校验 手机号，姓名 // 校验 手机号，姓名
if(!CollectionUtils.isEmpty(finalListContactsAll)){ 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()) List<PayContactsManagement> listContactsEquals = finalListContactsAll.stream().filter(p1->Objects.equals(p1.getCompanyId(),p.getCompanyId())
&& Objects.equals(p1.getName(),p.getName())).collect(Collectors.toList()); && Objects.equals(p1.getName(),p.getName())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsEquals)){ if(!CollectionUtils.isEmpty(listContactsEquals)){
msg.append("第").append(count + 3).append("行：联系人姓名已经存在，请修改。<br/>"); msg.append("第").append(count + 3).append("行：姓名已经存在，请修改。<br/>");
} }
} }
if (!StringUtils.isBlank(p.getPhone())){ if (!StringUtils.isBlank(p.getPhone())){