From 0fc2b1ded886d7eac96f6263c053372665e6ad00 Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期三, 13 四月 2022 18:01:04 +0800
Subject: [PATCH] 612和603更改
---
force-app/main/default/triggers/UserToContact.trigger | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/triggers/UserToContact.trigger b/force-app/main/default/triggers/UserToContact.trigger
index 63ea6a8..c182efc 100644
--- a/force-app/main/default/triggers/UserToContact.trigger
+++ b/force-app/main/default/triggers/UserToContact.trigger
@@ -1,4 +1,8 @@
trigger UserToContact on User (before insert, before update, after insert, after update) {
+ if(StaticParameter.EscapeContactToUser){
+ system.debug('StaticParameter.EscapeContactToUser'+StaticParameter.EscapeContactToUser);
+ return;
+ }
List<String> userEmployeeNoList = new List<String>();
List<String> userInterfaceList = new List<String>();
List<String> noList = new List<String>();
@@ -24,6 +28,9 @@
|| old.OnlinePlatformBuchang__c != local.OnlinePlatformBuchang__c //閮ㄩ暱 OnlinePlatformBuchang__c
|| old.OnlinePlatformManager__c != local.OnlinePlatformManager__c //缁忕悊 OnlinePlatformManager__c
|| old.FederationIdentifier != local.FederationIdentifier //鑱旂洘ID FederationIdentifier
+ //鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級鏀瑰彉鏇存柊鍒拌仈绯讳汉涓� thh 2022-02-17 start
+ || old.Work_Location_HR__c != local.Work_Location_HR__c
+ //鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級鏀瑰彉鏇存柊鍒拌仈绯讳汉涓� thh 2022-02-17 end
|| old.Salesdepartment__c != local.Salesdepartment__c // 閿�鍞湰閮� Saleddepartment_text__c
|| old.Category5__c != local.Category5__c // 閮� Category5__c
|| old.Category6__c != local.Category6__c // 璇� Category6__c
@@ -42,7 +49,7 @@
} else {
userEmployeeNoList.add(local.Employee_No__c);
- if ( local.Stay_or_not__c != '寰呭叆鑱�' && Trigger.isAfter) {
+ if ( local.Stay_or_not__c != '寰呭叆鑱�' && local.ProfileId !=System.Label.ProfileId_2J1 && Trigger.isAfter) {
noList.add(local.Id);
}
continue;
@@ -52,6 +59,9 @@
if (String.isNotBlank(local.Employee_No__c) && (Trigger.isInsert
|| old.Mobile_Phone__c != local.Mobile_Phone__c //鎵嬫満鍙风爜2 MobilePhone
|| old.Work_Location__c != local.Work_Location__c //宸ヤ綔鍦� Work_Location_manual__c
+ //鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級鏀瑰彉鏇存柊鍒拌仈绯讳汉涓� thh 2022-02-16 start
+ || old.Work_Location_HR__c != local.Work_Location_HR__c
+ //鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級鏀瑰彉鏇存柊鍒拌仈绯讳汉涓� thh 2022-02-16 end
|| old.Post__c != local.Post__c //鑱屼綅 Post_picklist__c
|| old.Gender__c != local.Gender__c //鎬у埆 Gender_text__c
|| old.Pregnant_Rest__c != local.Pregnant_Rest__c // 鏄惁浜у亣 Pregnant_Rest__c
@@ -103,6 +113,9 @@
|| oldu.Mobile_Phone__c != newu.Mobile_Phone__c//鎵嬫満鍙风爜
|| oldu.Post__c != newu.Post__c//鑱屼綅
|| oldu.Job_Category__c != newu.Job_Category__c//鑱岀
+ //鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級鏀瑰彉,鏇存柊HR淇℃伅涓婄殑鐢ㄦ埛瀛楁 thh 2022-02-17 start
+ || oldu.Work_Location_HR__c != newu.Work_Location_HR__c
+ //鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級鏀瑰彉,鏇存柊HR淇℃伅涓婄殑鐢ㄦ埛瀛楁 thh 2022-02-17 end
|| oldu.Product_specialist_incharge_product__c != newu.Product_specialist_incharge_product__c//璐熻矗浜у搧锛堜富锛�
|| oldu.Sales_Speciality__c != newu.Sales_Speciality__c//閿�鍞伐浣滃唴瀹�
|| oldu.Work_Location__c != newu.Work_Location__c//宸ヤ綔鍦�
--
Gitblit v1.9.1