From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/triggers/NFM001.trigger | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/triggers/NFM001.trigger b/force-app/main/default/triggers/NFM001.trigger
index adc0438..c2de55e 100644
--- a/force-app/main/default/triggers/NFM001.trigger
+++ b/force-app/main/default/triggers/NFM001.trigger
@@ -159,7 +159,7 @@
}
}
// OCM_Category__c銇仱銇勩仸鐥呴櫌銇椼亱銇ゃ亱銇ｃ仸銇亜銇熴倎銆佽ê鐧傜銈堛倞澶夋洿銇亗銈娿亪銇亜
- if (Trigger.oldMap.get(a.Id).get('OCM_Category__c') != a.OCM_Category__c && needSendRectMap.get(a.RecordTypeId) == '鐥呴櫌' && isChanged == false) {
+ if (null!=a.OCSMField2__c||(Trigger.oldMap.get(a.Id).get('OCM_Category__c') != a.OCM_Category__c && needSendRectMap.get(a.RecordTypeId) == '鐥呴櫌' && isChanged == false)) {
isChanged = true;
NFM001Controller.debug_msg = 'OCM_Category__c';
needChild = true;
@@ -296,8 +296,14 @@
insert iflog;
iflog = [Select Id, Name from BatchIF_Log__c where Id = :iflog.Id];
System.debug(Logginglevel.DEBUG, 'NFM001_' + iflog.Name + ' start'); // callout 銇腑 end 銇甽og銈掑嚭銇椼伨銇�
- NFM001Controller.callout(iflog.Id, accIds, purposeOfAdviceMap, needSendRectMap);
-
+ //NFM624瑙﹀彂001鍜�201鎺ュ彛 20221102 LY start
+ //NFM001Controller.callout(iflog.Id, accIds, purposeOfAdviceMap, needSendRectMap);
+ if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
+ NFM001Controller.calloutNotFuture(iflog.Id, accIds, purposeOfAdviceMap, needSendRectMap);
+ } else {
+ NFM001Controller.callout(iflog.Id, accIds, purposeOfAdviceMap, needSendRectMap);
+ }
+ //NFM624瑙﹀彂001鍜�201鎺ュ彛 20221102 LY end
// LHJ 鍚慡PO浼燦FM201 Start
NFM201Controller.debug_msg = accIds.size() + ',' + NFM201Controller.debug_msg;
BatchIF_Log__c iflog201 = new BatchIF_Log__c();
@@ -308,7 +314,14 @@
System.debug(Logginglevel.DEBUG, 'NFM201_' + iflog201.Name + ' start'); // callout 銇腑 end 銇甽og銈掑嚭銇椼伨銇�
//NFM201Controller.callout(iflog201.Id, accIds, purposeOfAdviceMap, needSendRectMap);
if(!System.Test.isRunningTest()){
- NFM201Controller.callout(iflog201.Id, accIds, purposeOfAdviceMap, needSendRectMap, needQuolifiedMap);
+ //NFM624瑙﹀彂001鍜�201鎺ュ彛 20221102 LY start
+ //NFM201Controller.callout(iflog201.Id, accIds, purposeOfAdviceMap, needSendRectMap, needQuolifiedMap);
+ if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
+ NFM201Controller.calloutNotFuture(iflog201.Id, accIds, purposeOfAdviceMap, needSendRectMap, needQuolifiedMap);
+ } else {
+ NFM201Controller.callout(iflog201.Id, accIds, purposeOfAdviceMap, needSendRectMap, needQuolifiedMap);
+ }
+ //NFM624瑙﹀彂001鍜�201鎺ュ彛 20221102 LY end
}
// LHJ End
//NFM201Controller.debug_msg = accIds.size() + ',' + NFM201Controller.debug_msg;
--
Gitblit v1.9.1