From 5c01ebbfddb6b8674430b47c22977bea2e350084 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 13 四月 2022 10:58:46 +0800
Subject: [PATCH] BackupPIPLFunction0413

---
 force-app/main/default/triggers/ContactHpDeptUpd.trigger |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/force-app/main/default/triggers/ContactHpDeptUpd.trigger b/force-app/main/default/triggers/ContactHpDeptUpd.trigger
index b420794..c7de2bd 100644
--- a/force-app/main/default/triggers/ContactHpDeptUpd.trigger
+++ b/force-app/main/default/triggers/ContactHpDeptUpd.trigger
@@ -1,14 +1,19 @@
 //鍖荤檪寰撲簨鑰呫伄瑷虹檪绉�(鍏煎嫏鍏�)銈掑鏇淬伄鍫村悎銆佹垿鐣ョ瀹ゃ兓鐥呴櫌銈備慨姝�
 trigger ContactHpDeptUpd on Contact (before insert, before update) {
+    if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+        return;
+    }
     List<String> accIds = new List<String>();
     List<String> FirstNameList = new List<String>();
     List<String> LastnameList = new List<String>();
+    List<String> LastnameEncryptedList = new List<String>();
     List<id> Hospital_id_list = new List<id>();
     List<id> ACCOUNT_id_list = new List<id>();
     Map<String,Contact> mapCon = new Map<String,Contact>();
 //***************************************INSERT 2016-12-14 By ZDF START*************************************
 //          澧炲姞鈥滄柊澧炲鎴蜂汉鍛樺叆渚嬭鍒欌��
 //***************************************INSERT 2016-12-14 By ZDF START*************************************
+//2022-02-10    PI鏀归�狅紝鐢↙astName_Encrypted__c鏇夸唬鍘熸湁鐨凬ame浣滀负mapCon鏄犲皠鐨勯敭
     for(Contact a : Trigger.new) {
         if (Trigger.isInsert
                 || (Trigger.isUpdate
@@ -21,8 +26,9 @@
         if(Trigger.isInsert&&a.Ignore_Same_Name__c==false){
             FirstNameList.add(a.firstname);
             LastnameList.add(a.Lastname);
+            LastnameEncryptedList.add(a.LastName_Encrypted__c);
             ACCOUNT_id_list.add(a.Accountid);
-            mapCon.put((a.firstname+a.Lastname),a);
+            mapCon.put(a.LastName_Encrypted__c,a);
             system.debug('========1111111');
         }
 
@@ -59,9 +65,10 @@
                                         from 
                                                 Contact 
                                         where   
-                                                firstname  in:FirstNameList
-                                        and
-                                                Lastname   in:LastnameList
+                                        //         firstname  in:FirstNameList
+                                        // and
+                                        //         Lastname   in:LastnameList
+                                        LastName_Encrypted__c in : LastnameEncryptedList
                                         and     
                                             (   
                                                 Account.Parent.Parentid  in:Hospital_id_list
@@ -73,22 +80,25 @@
                                 ];
         system.debug('========1212121212'+FirstNameList);
         system.debug('========1212121212'+LastnameList);
+        system.debug('========1212121212'+LastnameEncryptedList);
         system.debug('========1212121212'+Hospital_id_list);
         if(CntingList.size()>0){
             system.debug('========2222222'+CntingList.size());
             Contact Cnting = CntingList[0];
             for(Contact a : Trigger.new) {
                 system.debug('========3333333');
-                if(mapCon.containsKey(a.firstname+a.Lastname)){
-                system.debug('========333333');
-                if( Cnting.Account.Parent.Parent.Name   !=  null    ){
-                        a.addError('璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+Cnting.Account.Parent.Parent.Name+'鍖婚櫌涓嬪睘 '+Cnting.Account.Parent.Name+'鎴樼暐绉戝鐨� '+Cnting.Account.Name+'绉戝锛岃淇敼,鎴栬�呭嬀閫夆�滀笉鏄噸澶嶇殑瀹㈡埛鍚嶁�濆悗锛屽啀娆$偣鍑讳繚瀛�'+Cnting);
-                    }   else if (   Cnting.Account.Parent.Name  !=null  ){
-                        a.addError('璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+Cnting.Account.Parent.Name+'鍖婚櫌鐨� '+Cnting.Account.Name+' 鎴樼暐绉戝涓嬶紝璇蜂慨鏀�,鎴栬�呭嬀閫夆�滀笉鏄噸澶嶇殑瀹㈡埛鍚嶁�濆悗锛屽啀娆$偣鍑讳繚瀛�'+Cnting);
-                    }   else if (   Cnting.Account.Name !=  null    ){
-                        a.addError('璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+Cnting.Account.Name+'鍖婚櫌锛岃淇敼,鎴栬�呭嬀閫夆�滀笉鏄噸澶嶇殑瀹㈡埛鍚嶁�濆悗锛屽啀娆$偣鍑讳繚瀛�'+Cnting); 
+                if(mapCon.containsKey(a.LastName_Encrypted__c)){
+                    //For PIPL testing by Li Jun 20220308 Start
+                    // system.debug('========333333');
+                    // if( Cnting.Account.Parent.Parent.Name   !=  null    ){
+                    //         a.addError('璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+Cnting.Account.Parent.Parent.Name+'鍖婚櫌涓嬪睘 '+Cnting.Account.Parent.Name+'鎴樼暐绉戝鐨� '+Cnting.Account.Name+'绉戝锛岃淇敼,鎴栬�呭嬀閫夆�滀笉鏄噸澶嶇殑瀹㈡埛鍚嶁�濆悗锛屽啀娆$偣鍑讳繚瀛�');
+                    //     }   else if (   Cnting.Account.Parent.Name  !=null  ){
+                    //         a.addError('璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+Cnting.Account.Parent.Name+'鍖婚櫌鐨� '+Cnting.Account.Name+' 鎴樼暐绉戝涓嬶紝璇蜂慨鏀�,鎴栬�呭嬀閫夆�滀笉鏄噸澶嶇殑瀹㈡埛鍚嶁�濆悗锛屽啀娆$偣鍑讳繚瀛�');
+                    //     }   else if (   Cnting.Account.Name !=  null    ){
+                    //         a.addError('璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+Cnting.Account.Name+'鍖婚櫌锛岃淇敼,鎴栬�呭嬀閫夆�滀笉鏄噸澶嶇殑瀹㈡埛鍚嶁�濆悗锛屽啀娆$偣鍑讳繚瀛�'); 
+                    //     }
+                    //For PIPL testing by Li Jun 20220308 End
                     }
-                }
             }   
         }
     }

--
Gitblit v1.9.1