From 1b8c8764c39fc546ca1b85ff1810ae51be74331c Mon Sep 17 00:00:00 2001 From: Li Jun <buli@deloitte.com.cn> Date: 星期四, 31 三月 2022 18:39:23 +0800 Subject: [PATCH] PIPL0331V2Deploy --- force-app/main/default/triggers/Repair.trigger | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/force-app/main/default/triggers/Repair.trigger b/force-app/main/default/triggers/Repair.trigger index d520d7a..cc50c6d 100644 --- a/force-app/main/default/triggers/Repair.trigger +++ b/force-app/main/default/triggers/Repair.trigger @@ -18,16 +18,20 @@ //wangweipeng 20210727 end if ((Trigger.isAfter && Trigger.isInsert) || (Trigger.isAfter && Trigger.isUpdate) || (Trigger.isAfter && Trigger.isDelete)) { - if(!(System.isFuture()||System.isBatch())){// Add By Lijun 20220303 to avoid mutiple execute + // if(!(System.isFuture()||System.isBatch())){// Add By Lijun 20220303 to avoid mutiple execute NFM103Controller.NFM103Trigger(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap); NFM603Controller.NFM603Trigger(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap); RepairTrigger.UpdateAssert(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap); - } + // } } // ---------------------------------------------------------------------- // 銇撱亾銈堛倞銆佷慨鐞嗐伄銈点兗銉撱偣銈炽兂銉堛儵銈儓闋呯洰銈掕嚜鍕曠殑銇洿鏂般仚銈嬨儹銈搞儍銈� // ---------------------------------------------------------------------- if ( Trigger.isBefore && (Trigger.isInsert || Trigger.isUpdate)) { + //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220322 start + RepairTrigger.AdvancePaymentFlagUpsert(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap); + //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220322 end + // 绱嶅叆姗熷櫒ID銈掍竴鎰忋伀鏍肩磵銇欍倠 Set銇с仚銆� Set<ID> assetIds = new Set<Id>(); @@ -273,14 +277,10 @@ /****************************************************************************************************/ } } - //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220318 start - RepairTrigger.AdvancePaymentFlagUpsert(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap); - //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220318 end } // ---------------------------------------------------------------------- // 銇撱亾銇俱仹銆併偟銉笺儞銈广偝銉炽儓銉┿偗銉堥爡鐩倰鑷嫊鐨勩伀鏇存柊銇欍倠銉偢銉冦偗 // ---------------------------------------------------------------------- - // ---------------------------------------------------------------------- -- Gitblit v1.9.1