From 0c4796706fc9473d069b620321a54b20a119906c Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 11 七月 2023 14:16:44 +0800
Subject: [PATCH] Merge branch 'LEXUpgrade2023-Deloitte'

---
 force-app/main/default/triggers/ContentDocumentTrigger.trigger |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/triggers/ContentDocumentTrigger.trigger b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
index ed34043..f78e2b7 100644
--- a/force-app/main/default/triggers/ContentDocumentTrigger.trigger
+++ b/force-app/main/default/triggers/ContentDocumentTrigger.trigger
@@ -1,4 +1,7 @@
 trigger ContentDocumentTrigger on ContentDocument(before delete) {
+    if ((!Test.isRunningTest()) && 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 +64,4 @@
         System.debug('rentaldelList = ' + rentaldelList);
         ControllerUtil.delConsumableAccessoriesInvoiceSet(rentaldelList);
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1