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/ContentDocumentTrigger.trigger | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/triggers/ContentDocumentTrigger.trigger b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
index 319adf6..1a99718 100644
--- a/force-app/main/default/triggers/ContentDocumentTrigger.trigger
+++ b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
@@ -1,7 +1,14 @@
trigger ContentDocumentTrigger on ContentDocument(before delete) {
- // if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
- // return;
- // }
+<<<<<<< HEAD
+ if ((!Test.isRunningTest()) && UserInfo.getUserId() == System.Label.ByPassTrigger) {
+=======
+ System.debug('UserInfo.getUserId() = ' + UserInfo.getUserId());
+ System.debug('System.Label.ByPassTrigger = ' + System.Label.ByPassTrigger);
+ if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+ System.debug('enter ContentDocumentTrigger but UserInfo.getUserId()==System.Label.ByPassTrigger');
+>>>>>>> LEXCommunityLiJun
+ return;
+ }
System.debug('enter ContentDocumentTrigger');
// system.debug('Trigger.new = ' + (List<ContentDocument>) Trigger.new);
// system.debug('Trigger.old = ' + (List<ContentDocument>) Trigger.old);
@@ -64,4 +71,4 @@
System.debug('rentaldelList = ' + rentaldelList);
ControllerUtil.delConsumableAccessoriesInvoiceSet(rentaldelList);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1