From 78ac43791ac9e9d75ce4c33e9dddbdffa88fec2f Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期一, 23 五月 2022 19:00:04 +0800
Subject: [PATCH] 客户人员重复判断
---
force-app/main/default/classes/NFM624Rest.cls | 56 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index bbaf611..6af9655 100644
--- a/force-app/main/default/classes/NFM624Rest.cls
+++ b/force-app/main/default/classes/NFM624Rest.cls
@@ -244,17 +244,28 @@
for (Contact ct: peopleList) {
if (string.isnotblank(ct.Account.parent.Name)) {
Map < String, Contact > snameMap = new Map < String, Contact > ();
- string namekey = ct.Account.Name + ' ' + ct.LastName_Encrypted__c.trim();
- string nameKey2 = ct.Account.Management_Code__c + ' ' + ct.LastName_Encrypted__c.trim();
+ string namekey;
+ string nameKey2;
+ if(String.isBlank(ct.MobilePhone_Encrypted__c)){
+ namekey = ct.Account.Name + ' ' + ct.LastName_Encrypted__c.trim();
+ nameKey2 = ct.Account.Management_Code__c + ' ' + ct.LastName_Encrypted__c.trim();
+ } else{
+ namekey = ct.Account.Name + ' ' + ct.LastName_Encrypted__c.trim() + ' ' + ct.MobilePhone_Encrypted__c.trim();
+ nameKey2 = ct.Account.Management_Code__c + ' ' + ct.LastName_Encrypted__c.trim() + ' ' + ct.MobilePhone_Encrypted__c.trim();
+ }
// snameMap.put(namekey,ct);
if (nameMap.containsKey(ct.Account.parent.Name)) {
snameMap = nameMap.get(ct.Account.parent.Name);
}
snameMap.put(namekey, ct);
snameMap.put(nameKey2,ct);
- // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
- snameMap.put(ct.LastName_Encrypted__c.trim() + ct.MobilePhone_Encrypted__c.trim(), ct);
- // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
+ // // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ // if(String.isBlank(ct.MobilePhone_Encrypted__c)){
+ // snameMap.put(ct.LastName_Encrypted__c.trim(), ct);
+ // } else{
+ // snameMap.put(ct.LastName_Encrypted__c.trim() + ct.MobilePhone_Encrypted__c.trim(), ct);
+ // }
+ // // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
nameMap.put(ct.Account.parent.Name, snameMap);
system.debug('snameMap'+snameMap);
}
@@ -394,7 +405,8 @@
} else { //浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�
//鎼滅储浜哄悕/涓斿湪褰撳墠鎴樼暐绉戝绉戝涓�
System.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�');
- string namekey = gedata.RelatedDepartment + ' ' + gedata.NameEncrypted;
+ string namekey = gedata.RelatedDepartment + ' ' + gedata.NameEncrypted + ' ' + gedata.MobileEncrypted;
+ string namekey1 = gedata.RelatedDepartment + ' ' + gedata.NameEncrypted;
system.debug('DepartmentClasskey = '+DepartmentClasskey);
system.debug('nameMap22222222 '+nameMap);
if (nameMap.containskey(DepartmentClasskey)) { // 6 瀹屾垚 鏇存柊鎿嶄綔
@@ -402,13 +414,16 @@
System.debug('sMap'+sMap);
System.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey));
System.debug('sMap.containsKey(gedata.NameEncrypted)'+sMap.containsKey(gedata.NameEncrypted));
- if (sMap.containsKey(namekey) && sMap.get(namekey).UnifiedI_Contact_ID__c == null) {
+ if (sMap.containsKey(namekey)) {
system.debug('Id璧嬪��'+sMap);
ct.id = sMap.get(namekey).id;
- // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
- } else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
- ct.id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).id;
- // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
+ } else if (sMap.containsKey(namekey1) && sMap.get(namekey1).UnifiedI_Contact_ID__c == null) {
+ ct.id = sMap.get(namekey1).id;
+
+ // // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ // } else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
+ // ct.id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).id;
+ // // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
}else { // 7 瀹屾垚
system.debug('7閫昏緫 鏃犱汉鍛樼鐞嗙紪鐮� 鏈夊尰闄� 鏈夌瀹� 浜哄悕鏌ユ壘鏃� 鍔ㄤ綔锛氭柊寤鸿仈绯讳汉 ');
}
@@ -441,7 +456,7 @@
}
} else { //浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�
system.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�');
- string namekey = gedata.DepartmentName+ ' ' + gedata.NameEncrypted;
+ string namekey = gedata.DepartmentName + ' ' + gedata.NameEncrypted + ' ' + gedata.MobileEncrypted;
//string namekey = gedata.AccountName + ' ' + gedata.DepartmentName + ' ' + gedata.DepartmentClass + ' ' + gedata.Name;
system.debug('DepartmentClasskey'+DepartmentClasskey);
system.debug('351nameMap '+nameMap);
@@ -450,8 +465,8 @@
system.debug('鎴樼暐绉戝瀛樺湪' + nameMap.get(DepartmentClasskey));
Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
system.debug('namekey'+namekey);
- system.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey) );
- if (sMap.containsKey(namekey) && sMap.get(namekey).UnifiedI_Contact_ID__c == null) { //鏌ユ壘瀛樺湪 8 瀹屾垚
+ system.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey));
+ if (sMap.containsKey(namekey)) { //鏌ユ壘瀛樺湪 8 瀹屾垚
system.debug('8閫昏緫');
system.debug('璇ヨ仈绯讳汉瀛樺湪');
ct.id = sMap.get(namekey).id;
@@ -460,13 +475,14 @@
// if(sMap.containsKey(gedata.Name)){
// ct.Id = sMap.get(gedata.Name).Id;
// }
- // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
- }else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
- system.debug('1234567890');
- ct.Id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).Id;
- //upsertAccountList.add(dpt);
- upsertContactList.add(ct);
}
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ // else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
+ // system.debug('1234567890');
+ // ct.Id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).Id;
+ // //upsertAccountList.add(dpt);
+ // upsertContactList.add(ct);
+ // }
// 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
system.debug('contactMap ' + contactMap);
System.debug('9閫昏緫');
--
Gitblit v1.9.1