From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/triggers/AccountTrigger.trigger | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/triggers/AccountTrigger.trigger b/force-app/main/default/triggers/AccountTrigger.trigger
index 1476603..d46f336 100644
--- a/force-app/main/default/triggers/AccountTrigger.trigger
+++ b/force-app/main/default/triggers/AccountTrigger.trigger
@@ -2,10 +2,7 @@
* 瀹㈡埛鍚屾 鍦⊿P銆丟I涓绘媴褰撳彉鍖栨椂鏇存柊璇环鏉冮檺
*/
trigger AccountTrigger on Account (after insert, after update, before delete, before insert, before update, after delete ) {
- if (StaticParameter.EscapeAccountTrigger) {
-System.debug('Escape銆丒scapeAccountTrigger:::::' + StaticParameter.EscapeAccountTrigger);
- return;
- }
+
if ((Trigger.isAfter && Trigger.isInsert) || (Trigger.isAfter && Trigger.isUpdate) || (Trigger.isBefore && Trigger.isDelete)) {
// 鍚屾鍒� Account2__c
AccountTrigger.syncAccount2(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
@@ -21,6 +18,7 @@
if (Trigger.isBefore && (Trigger.isInsert || Trigger.isUpdate)) {
System.debug('=============> checkDepartment start');
AccountTrigger.checkDepartment(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ /**20221013 you LLIU-CK53S4
if(Trigger.isUpdate){
for(Account acc : Trigger.new){
if( acc.Is_Active__c == '鐒″姽' && acc.OwnerId == UserInfo.getUserId()){
@@ -30,6 +28,7 @@
}
}
+ **/
}
if (System.Test.isRunningTest()) {
if(Trigger.isInsert & Trigger.isAfter){
@@ -130,6 +129,10 @@
}
}
//HWAG-B4PCZ5 2018-09-19 end
+ if (StaticParameter.EscapeAccountTrigger) {
+ System.debug('Escape銆丒scapeAccountTrigger:::::' + StaticParameter.EscapeAccountTrigger);
+ return;
+ }
//NFM112 2021/11/10 start
List<String> IdList = new List<String>();
for(Account account : Trigger.new){
--
Gitblit v1.9.1