From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/triggers/SyncRepairFromMCAETrigger.trigger | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/triggers/SyncRepairFromMCAETrigger.trigger b/force-app/main/default/triggers/SyncRepairFromMCAETrigger.trigger
index b2e171a..931723b 100644
--- a/force-app/main/default/triggers/SyncRepairFromMCAETrigger.trigger
+++ b/force-app/main/default/triggers/SyncRepairFromMCAETrigger.trigger
@@ -1,5 +1,7 @@
trigger SyncRepairFromMCAETrigger on Repair__c (before insert, before update) {
- if (Trigger.isBefore) {
- SyncRepairFromMCAETrigger.syncRepair(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ if(Test.isRunningTest()||UserInfo.getUserId()!=System.Label.ByPassTrigger){
+ if (Trigger.isBefore) {
+ SyncRepairFromMCAETrigger.syncRepair(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1