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/ContentDocumentTrigger.trigger | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/triggers/ContentDocumentTrigger.trigger b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
index 1a99718..83374a2 100644
--- a/force-app/main/default/triggers/ContentDocumentTrigger.trigger
+++ b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
@@ -1,12 +1,8 @@
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){
+ if ((!Test.isRunningTest()) && UserInfo.getUserId() == System.Label.ByPassTrigger) {
System.debug('enter ContentDocumentTrigger but UserInfo.getUserId()==System.Label.ByPassTrigger');
->>>>>>> LEXCommunityLiJun
return;
}
System.debug('enter ContentDocumentTrigger');
--
Gitblit v1.9.1