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/RentalHpDeptUpd.trigger | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/triggers/RentalHpDeptUpd.trigger b/force-app/main/default/triggers/RentalHpDeptUpd.trigger
index 2502ab2..a0fab14 100644
--- a/force-app/main/default/triggers/RentalHpDeptUpd.trigger
+++ b/force-app/main/default/triggers/RentalHpDeptUpd.trigger
@@ -1,4 +1,6 @@
trigger RentalHpDeptUpd on Rental_Apply__c (before insert,after insert,before update) {
- RentalHpDeptUpdHandler handler = new RentalHpDeptUpdHandler();
- handler.run();
+ if(Test.isRunningTest()||UserInfo.getUserId()!=System.Label.ByPassTrigger){
+ RentalHpDeptUpdHandler handler = new RentalHpDeptUpdHandler();
+ handler.run();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1