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 |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/triggers/ContentDocumentTrigger.trigger b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
index ed34043..83374a2 100644
--- a/force-app/main/default/triggers/ContentDocumentTrigger.trigger
+++ b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
@@ -1,4 +1,10 @@
 trigger ContentDocumentTrigger on ContentDocument(before delete) {
+    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');
+        return;
+    }
     System.debug('enter ContentDocumentTrigger');
     //     system.debug('Trigger.new = ' + (List<ContentDocument>) Trigger.new);
     //     system.debug('Trigger.old = ' + (List<ContentDocument>) Trigger.old);
@@ -61,4 +67,4 @@
         System.debug('rentaldelList = ' + rentaldelList);
         ControllerUtil.delConsumableAccessoriesInvoiceSet(rentaldelList);
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1