From 69dc5df6ec51f6f7f6737c61d9c4c1e7757a2b96 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 17 三月 2022 21:05:08 +0800
Subject: [PATCH] PIPLFixBugs0317V1
---
force-app/main/default/classes/ContactTriggerHandler.cls | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/ContactTriggerHandler.cls b/force-app/main/default/classes/ContactTriggerHandler.cls
index a438297..fcbbc45 100644
--- a/force-app/main/default/classes/ContactTriggerHandler.cls
+++ b/force-app/main/default/classes/ContactTriggerHandler.cls
@@ -228,9 +228,40 @@
Pattern pattern = Pattern.compile('^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$');
Map<String, Map<String,Contact>> accountContactMap = new Map<String, Map<String,Contact>>();
Set<Id> accountIdSet = new Set<Id>();
+ //鐢ㄦ埛瀵硅薄涓婃壘瀵瑰簲鐨勮仈绯讳汉
+ List<User> userList=[select ID,ContactID from User where ContactID != null];
+ Map<String,User> userMap= new Map<String,User>();
+ if (userList.size()>0){
+ for(User us1: userList){
+ userMap.put(us1.ContactId, us1);
+ }
+ }
+ //鏌ユ壘鑱旂郴浜哄璞′笂瀵瑰簲鐨勬湁鏁堝鎴凤紱鍖婚櫌鐩存帴浣跨敤鏈夋晥/鏃犳晥瀛楁銆佺粡閿�鍟嗕娇鐢ㄦ湁鏁�/鏃犳晥鍏紡瀛楁
+ List<String> accIdList = new List<String>();
+ Map<String,String> accMap= new Map<String,String>();
+ for (Contact contact1: newList) {
+ accIdList.add(contact1.AccountId);
+ }
+ if (accIdList.size()>0){
+ List<Account> accList=[select ID,Is_Active__c,Is_Active_Formula__c from Account where ID in:accIdList];
+ if(accList.size()>0){
+ for(Account acc:accList){
+ if (String.isNotBlank(acc.Is_Active__c)){
+ accMap.put(acc.Id, acc.Is_Active__c);
+ continue;
+ }
+ if (String.isNotBlank(acc.Is_Active_Formula__c)){
+ accMap.put(acc.Id, acc.Is_Active_Formula__c);
+ }
+ }
+ }
+ }
for (Contact contactnew: newList) {
- // 鎵嬫満鍙� 鏈夊�� 骞朵笖 鑱旂郴浜烘湁鏁� 杩涜鎵嬫満鍙风爜楠岃瘉
- if (String.isNotBlank(contactnew.MobilePhone) && '鏈夋晥'.equals(contactnew.Isactive__c)) {
+ // 鎵嬫満鍙� 鏈夊�� 骞朵笖 鑱旂郴浜烘湁鏁� 鑱旂郴浜虹殑瀹㈡埛鏈夋晥 鏃犲閮ㄥ叧鑱旂敤鎴� 杩涜鎵嬫満鍙风爜楠岃瘉
+ if (String.isNotBlank(contactnew.MobilePhone) && ('鏈夋晥'.equals(contactnew.Isactive__c) ||'鏈夊姽'.equals(contactnew.Isactive__c))
+ && '鏈夊姽'.equals(accMap.get(contactnew.AccountId))
+ && !userMap.containsKey(contactnew.Id)
+ ) {
Matcher isMobilePhone = pattern.matcher(contactnew.MobilePhone);
if (isMobilePhone.matches()) {
// 灏嗘墜鏈哄彿 璧嬪�肩粰 鎵嬫満鍙峰敮涓�瀛楁
@@ -253,7 +284,8 @@
}
// 鏂板鑱旂郴浜烘椂锛�
if (accountIdSet.size() > 0) {
- List<Contact> contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c
+ List<Contact> contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c,
+ LastName_Encrypted__c// 20220314 PI鏀归�� by Bright
FROM Contact
WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet];
if ( contactList.size() > 0) {
@@ -262,6 +294,10 @@
String lastNameStr = String.isNotBlank(contact.LastName) ? contact.LastName:'';
String firstNameStr = String.isNotBlank(contact.FirstName) ? contact.FirstName:'';
String contactFullName = lastNameStr + firstNameStr;
+ contactFullName = contact.LastName_Encrypted__c;// 20220314 PI鏀归�� by Bright
+ if(string.isBlank(contactFullName)){
+ continue;
+ }
String accountId = String.valueOf(contact.AccountId).SubString(0,15);
Map<String,Contact> contactFullNameMap = new Map<String,Contact>();
if (accountContactMap.containsKey(accountId)) {
@@ -284,7 +320,7 @@
String lastNameStr = String.isNotBlank(contactnew.LastName) ? contactnew.LastName:'';
String firstNameStr = String.isNotBlank(contactnew.FirstName) ? contactnew.FirstName:'';
String contactFullName = lastNameStr + firstNameStr;
-
+ contactFullName = contactnew.LastName_Encrypted__c;// 20220314 PI鏀归�� by Bright
if (contactFullNameMap.containsKey(contactFullName)) {
String accountName = contactFullNameMap.get(contactFullName).Account.Name;
String cManageCode = contactFullNameMap.get(contactFullName).CManageCode__c;
--
Gitblit v1.9.1