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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/triggers/ContentDocumentLink.trigger b/force-app/main/default/triggers/ContentDocumentLink.trigger
index 2ea867a..d01d1f6 100644
--- a/force-app/main/default/triggers/ContentDocumentLink.trigger
+++ b/force-app/main/default/triggers/ContentDocumentLink.trigger
@@ -1,8 +1,16 @@
+<<<<<<< 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) {
- // if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
- // return;
- // }
+ 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');
system.debug('Trigger.new = ' + (List<ContentDocumentLink>) Trigger.new);
system.debug('Trigger.old = ' + (List<ContentDocumentLink>) Trigger.old);
@@ -44,7 +52,6 @@
// }
// }
-
if (rentalIds.size() > 0) {
List<Consumable_order__c> rentalList = new List<Consumable_order__c>();
for (Consumable_order__c ra : [SELECT Id FROM Consumable_order__c WHERE Id IN :rentalIds]) {
@@ -68,4 +75,5 @@
// System.debug('rentaldelList = ' + rentaldelList);
// ControllerUtil.delConsumableAccessoriesInvoiceSet(rentaldelList);
// }
-}
\ No newline at end of file
+
+}
--
Gitblit v1.9.1