From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/triggers/ReportHpDeptUpd.trigger | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/triggers/ReportHpDeptUpd.trigger b/force-app/main/default/triggers/ReportHpDeptUpd.trigger
index 2a7b435..533958c 100644
--- a/force-app/main/default/triggers/ReportHpDeptUpd.trigger
+++ b/force-app/main/default/triggers/ReportHpDeptUpd.trigger
@@ -1,4 +1,7 @@
trigger ReportHpDeptUpd on Report__c (before insert, before update) {
+ if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+ return;
+ }
List<String> accIds = new List<String>();
for(Report__c a : Trigger.new) {
--
Gitblit v1.9.1