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 | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/triggers/ContentDocumentTrigger.trigger b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
index 44da932..1a99718 100644
--- a/force-app/main/default/triggers/ContentDocumentTrigger.trigger
+++ b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
@@ -1,8 +1,12 @@
trigger ContentDocumentTrigger on ContentDocument(before delete) {
+<<<<<<< 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');
@@ -67,4 +71,4 @@
System.debug('rentaldelList = ' + rentaldelList);
ControllerUtil.delConsumableAccessoriesInvoiceSet(rentaldelList);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1