From 8fe9d222c9453a3f09c6d5681dde0b2fd1600417 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期二, 24 五月 2022 12:07:45 +0800
Subject: [PATCH] 修改客户人员更新逻辑

---
 force-app/main/default/classes/ContactTriggerHandler.cls |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/force-app/main/default/classes/ContactTriggerHandler.cls b/force-app/main/default/classes/ContactTriggerHandler.cls
index 2a374e0..336ccc0 100644
--- a/force-app/main/default/classes/ContactTriggerHandler.cls
+++ b/force-app/main/default/classes/ContactTriggerHandler.cls
@@ -326,13 +326,13 @@
                                          LastName_Encrypted__c// 20220314 PI鏀归�� by Bright
                                          , MobilePhone_Encrypted__c // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518
                                         FROM Contact 
-                                        WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet];
+                                        WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet AND Id Not IN: oldMap.keyset()];
             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 +351,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 +364,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