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/ContentDocumentLink.trigger | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/triggers/ContentDocumentLink.trigger b/force-app/main/default/triggers/ContentDocumentLink.trigger
index 12b8b8f..d01d1f6 100644
--- a/force-app/main/default/triggers/ContentDocumentLink.trigger
+++ b/force-app/main/default/triggers/ContentDocumentLink.trigger
@@ -1,5 +1,14 @@
+<<<<<<< HEAD
trigger ContentDocumentLink on ContentDocumentLink(before delete, after insert) {
if ((!Test.isRunningTest()) && UserInfo.getUserId() == System.Label.ByPassTrigger) {
+=======
+trigger ContentDocumentLink on ContentDocumentLink (before delete, after insert) {
+
+ 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 ContentDocumentLink but UserInfo.getUserId()==System.Label.ByPassTrigger');
+>>>>>>> LEXCommunityLiJun
return;
}
system.debug('enter ContentDocumentLink');
--
Gitblit v1.9.1