From 4c731202d2d9d4c55f44ffb2a5d31085ba7b0aef Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 28 Feb 2024 10:25:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

导入的时候修改导入逻辑：
1、系统已存在的人员信息（以手机号为唯一值匹配），则跳过不再处理
2、系统中不存在 但是数据格式正确的数据 直接导入成功
3、错误的数据，提示哪行错误
---
 .../controller/PayContactsManagementController.java      | 9 +++++++++
 1 file changed, 9 insertions(+)

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 ede52c61..acf60921 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
@@ -955,6 +955,15 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 					List<PayContactsManagement> finalListContactsAll = listContactsAll;
 					List<PayContactsManagement> finalListContactsNameAll = listContactsNameAll;
 					list.forEach(p->{
+						// 变更 以手机号为唯一值判断已存在的数据不再参加导入
+						if(!CollectionUtils.isEmpty(finalListContactsAll)){
+							// 校验 表中是否存手机号
+							List<PayContactsManagement> listCompanyEquals = finalListContactsAll.stream().filter(p1->Objects.equals(p1.getPhone(),PasswordUtil.encrypt(p.getPhone()))).collect(Collectors.toList());
+							if(!CollectionUtils.isEmpty(listCompanyEquals)){
+								listRemove.add(p);
+								return;
+							}
+						}
 						int count = list.indexOf(p);
 						// 校验excel表中是否存在重复手机号
 						List<PayContactsManagement> listContactsPhone = listContacts.stream().filter(p1->Objects.equals(p1.getPhone(),p.getPhone())).collect(Collectors.toList());