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