From 3aaf6c0574e376b15ca88650460256e078ad16bd Mon Sep 17 00:00:00 2001 From: liuyan <liuyan@prec-tech.com> Date: 星期四, 17 十一月 2022 16:09:17 +0800 Subject: [PATCH] 624向SPO推科室 --- force-app/main/default/classes/NFM201Controller.cls | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/force-app/main/default/classes/NFM201Controller.cls b/force-app/main/default/classes/NFM201Controller.cls index 8ea3bea..32b3b47 100644 --- a/force-app/main/default/classes/NFM201Controller.cls +++ b/force-app/main/default/classes/NFM201Controller.cls @@ -44,7 +44,12 @@ * @param needSendRectMap 閫佷俊瀵捐薄銇儸銈炽兗銉夈偪銈ゃ儣銇甿ap */ @future (callout=true) + //NFM624瑙﹀彂001鍜�201鎺ュ彛 20221102 LY start public static void callout(String iflog_Id, List<String> accIds, Map<String, String> purposeOfAdviceMap, Map<String, String> needSendRectMap, Map<String, String> needQuolifiedMap) { + calloutNotFuture(iflog_Id,accIds,purposeOfAdviceMap,needSendRectMap,needQuolifiedMap); + } + //NFM624瑙﹀彂001鍜�201鎺ュ彛 20221102 LY end + public static void calloutNotFuture(String iflog_Id, List<String> accIds, Map<String, String> purposeOfAdviceMap, Map<String, String> needSendRectMap, Map<String, String> needQuolifiedMap) { if (accIds == null || accIds.size() == 0) { return; } @@ -187,7 +192,13 @@ endUser.PurposeOfAdvice = purposeOfAdviceMap.get(acc.Id); endUser.SectionCategory = NFMUtil.getMapValue(transferMap, 'Department_Class_Label__c', acc.Department_Class__r.Department_Class_Label__c, iflog); //endUser.SectionName = acc.Department_Name__c; - endUser.SectionName = acc.name; + //NFM624瑙﹀彂001鍜�201鎺ュ彛 LY 20221109 start + if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){ + endUser.SectionName = acc.Hospital__r.Name+' '+acc.Department_Class__r.Department_Class_Label__c+' '+acc.Department_Name__c; + }else{ + endUser.SectionName = acc.name; + } + //NFM624瑙﹀彂001鍜�201鎺ュ彛 LY 20221109 end endUser.SectionCode = acc.Management_Code__c; //endUser.NeedQuolified = acc.Hospital__r.If_Need_Quolified__c; endUser.NeedQuolified = false; @@ -277,9 +288,17 @@ // 銈ㄣ儵銉笺亴鐧虹敓銇椼仧鍫村悎 System.debug(Logginglevel.ERROR, 'NFM201_' + iflog.Name + ':' + ex.getMessage()); System.debug(Logginglevel.ERROR, 'NFM201_' + iflog.Name + ':' + ex.getStackTraceString()); - logstr += ex.getMessage(); - iflog.ErrorLog__c += ex.getMessage() + '\n'; - iflog.ErrorLog__c += ex.getStackTraceString() + '\n'; + + //NFM624瑙﹀彂001鍜�201鎺ュ彛 20221102 LY start + // Callout from triggers are currently not supported. + System.debug('NFM201jiekou'+ex.getMessage()); + if (!String.valueOf(ex.getMessage()).contains('Callout from triggers')) { + + logstr += ex.getMessage(); + iflog.ErrorLog__c += ex.getMessage() + '\n'; + iflog.ErrorLog__c += ex.getStackTraceString() + '\n'; + } + //NFM624瑙﹀彂001鍜�201鎺ュ彛 20221102 LY end if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0; if (rowData.retry_cnt__c < batch_retry_max_cnt) { -- Gitblit v1.9.1