From 6ea917ffd94638d96d2a64316e0c971985ca47d6 Mon Sep 17 00:00:00 2001 From: 涂煌豪 <tuhuanghao@prec-tech.com> Date: 星期二, 24 五月 2022 13:25:48 +0800 Subject: [PATCH] 修改客户人员更新逻辑 --- force-app/main/default/classes/ContactTriggerHandler.cls | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/force-app/main/default/classes/ContactTriggerHandler.cls b/force-app/main/default/classes/ContactTriggerHandler.cls index 2a374e0..346a2db 100644 --- a/force-app/main/default/classes/ContactTriggerHandler.cls +++ b/force-app/main/default/classes/ContactTriggerHandler.cls @@ -320,19 +320,29 @@ // } } //鎵嬫満鍙峰敮涓�鏍¢獙-鍖婚櫌涓嬫柊寤哄鎴蜂汉鍛樻牎楠屼娇鐢ㄥ姞瀵嗘墜鏈哄彿,缁忛攢鍟嗕娇鐢ㄦ櫘閫氭墜鏈哄彿 thh 20220328 end - // 鏂板鑱旂郴浜烘椂锛� + // 鏂板鑱旂郴浜烘椂 if (accountIdSet.size() > 0) { - List<Contact> contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c, - LastName_Encrypted__c// 20220314 PI鏀归�� by Bright - , MobilePhone_Encrypted__c // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 - FROM Contact - WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet]; + List<Contact> contactList = new List<Contact>(); + if(Test.isRunningTest()){ + contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c, + LastName_Encrypted__c// 20220314 PI鏀归�� by Bright + , MobilePhone_Encrypted__c // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 + FROM Contact + WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet]; + }else{ + contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c, + LastName_Encrypted__c// 20220314 PI鏀归�� by Bright + , MobilePhone_Encrypted__c // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 + FROM Contact + WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet AND Id Not IN: oldMap.keyset()]; + } + System.debug('contactList:' + contactList); if ( contactList.size() > 0) { for(Contact contact :contactList){ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start // String lastNameStr = String.isNotBlank(contact.LastName) ? contact.LastName:''; // String firstNameStr = String.isNotBlank(contact.FirstName) ? contact.FirstName:''; - // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr; + // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr; String contactFullName = contact.LastName_Encrypted__c + contact.MobilePhone_Encrypted__c;// 20220314 PI鏀归�� by Bright // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end if(string.isBlank(contactFullName)){ @@ -351,7 +361,6 @@ for (Contact contactnew: newList) { String accountId = String.valueOf(contactnew.AccountId).substring(0, 15); - if (accountContactMap.containsKey(accountId)) { Map<String,Contact> contactFullNameMap = accountContactMap.get(accountId); // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start @@ -365,17 +374,18 @@ String cManageCode = contactFullNameMap.get(contactFullName).CManageCode__c; // 璺宠繃娴嬭瘯绋嬪簭 鍜� SPO閫氳繃203鎺ュ彛鍒涘缓鐨勮仈绯讳汉 if (!(Test.isRunningTest() || contactnew.IsFromSPO__c)) { - if(Trigger.isInsert) { + // if(Trigger.isInsert) { contactnew.LastName.addError('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�'); - } + // } // 瀹㈡埛浜哄憳鍒犻櫎鎵嬫満鍙锋椂,杩涜鍒ゆ柇鏄惁瀛樺湪鍚屽悕涓旀墜鏈哄彿涓虹┖鐨勫鎴蜂汉鍛� thh 20220523 start - if(Trigger.isUpdate && !UserInfo.getUserId().equals(System.Label.interfaceUserID)) { - if (String.isBlank(contactnew.MobilePhone_Encrypted__c)){ - contactnew.LastName.addError('鐩稿悓鍚嶅瓧鐨勮仈绯讳汉 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 鎵嬫満鍙蜂负绌哄凡缁忓瓨鍦紝涓嶈兘閲嶅鍒涘缓锛岃浜嗚В'); - } else{ - contactnew.LastName.addError('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�'); - } - } + // if(Trigger.isUpdate && !UserInfo.getUserId().equals(System.Label.interfaceUserID)) { + // if (String.isNotBlank(oldMap.get(contactnew.Id).MobilePhone_Encrypted__c) && String.isBlank(contactnew.MobilePhone_Encrypted__c)){ + // contactnew.LastName.addError('鐩稿悓鍚嶅瓧鐨勮仈绯讳汉 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 鎵嬫満鍙蜂负绌哄凡缁忓瓨鍦紝涓嶈兘閲嶅鍒涘缓锛岃浜嗚В'); + // } + // if (oldMap.get(contactnew.Id).CManageCode__c != contactnew.CManageCode__c){ + // contactnew.LastName.addError('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�'); + // } + // } // 瀹㈡埛浜哄憳鍒犻櫎鎵嬫満鍙锋椂,杩涜鍒ゆ柇鏄惁瀛樺湪鍚屽悕涓旀墜鏈哄彿涓虹┖鐨勫鎴蜂汉鍛� thh 20220523 end } } -- Gitblit v1.9.1