From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/triggers/ContentDocumentLink.trigger | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/triggers/ContentDocumentLink.trigger b/force-app/main/default/triggers/ContentDocumentLink.trigger
index d01d1f6..4590320 100644
--- a/force-app/main/default/triggers/ContentDocumentLink.trigger
+++ b/force-app/main/default/triggers/ContentDocumentLink.trigger
@@ -1,14 +1,8 @@
-<<<<<<< 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){
+ 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