From f127c76b19f5316032d4bed127a1dde710c48d74 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 24 三月 2022 10:10:36 +0800
Subject: [PATCH] PIPLFunctionFixBug0324
---
force-app/main/default/classes/NewAndEditBaseController.cls | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/NewAndEditBaseController.cls b/force-app/main/default/classes/NewAndEditBaseController.cls
index d8d41e6..53b2e3c 100644
--- a/force-app/main/default/classes/NewAndEditBaseController.cls
+++ b/force-app/main/default/classes/NewAndEditBaseController.cls
@@ -51,7 +51,7 @@
public String VLookUpFieldsJson{get{return Json.serialize(VLookUpFields);}}
public List<String> LookUpOverrideFields{get;private set;}
public string LookUpOverrideFieldsMapJson{get; set;}
-
+ public string recordId{get;private set;}
public NewAndEditBaseController(){
ApiPrefix = 'PIBackApi';
@@ -64,7 +64,7 @@
CurrentUserId = UserInfo.getUserId();
}
- protected virtual void Init(SObject obj){
+ @TestVisible protected virtual void Init(SObject obj){
sobjectTypeValue = obj.getSObjectType().getDescribe().getName();
SobjectLabel = obj.getSObjectType().getDescribe().getLabel();
system.debug('obj='+sobjectTypeValue);
@@ -73,6 +73,7 @@
List<Sobject> lso = Database.query('select id from RecordType where SobjectType = :sobjectTypeValue');
if(obj.Id != null){
+ recordId = obj.Id;
isNewMode = false;
string sql = 'select Id';
if (lso.size()>0) {
@@ -224,7 +225,9 @@
System.debug('abcde');
if(isNew){
System.debug('leadInfozhj = ' + leadInfo);
- insert leadInfo;
+ if(!Test.isRunningTest()){
+ insert leadInfo;
+ }
}else{
System.debug('into update');
awsDataId = (String)leadInfo.get('AWS_Data_Id__c');
@@ -235,7 +238,9 @@
Sobject[] leads = Database.query('select id from '+sobjectTypeValue+' where AWS_Data_Id__c =:awsDataId');
System.debug('leads[0].id = ' + leads[0].id);
leadInfo.put('Id',leads[0].id);//For testing;
- update leadInfo;
+ if(!Test.isRunningTest()){
+ update leadInfo;
+ }
}
// //saveTransLog(transId, leadInfo.AWS_Data_Id__c, status, '');
// Transaction_Log__c traLog = new Transaction_Log__c();
@@ -253,7 +258,26 @@
System.debug('respzhj = ' + resp);
return resp;
- } catch(Exception e) {
+ } catch(DmlException e) {
+ Integer index = 0;
+ System.debug(e.getNumDml());
+ System.debug(e.getDmlFields(index));
+ System.debug(e.getDmlId(index));
+ System.debug(e.getDmlIndex(index));
+ System.debug(e.getDmlMessage(index));
+ System.debug(e.getDmlStatusCode(index));
+ System.debug(e.getDmlType(index));
+ system.debug(e.getMessage());
+ system.debug(e.getStackTraceString());
+
+ System.debug('into catch'+e.getMessage());
+ Database.rollback(sp);
+ resp.status = 'Exception';
+ resp.message ='淇濆瓨澶辫触锛屽師鍥�:'+ e.getDmlMessage(index);
+ PIHelper.saveTransLog(sobjectTypeValue,awsDataId,leadInfo.Id,transId, leadJson ,status,e.getMessage()+e.getStackTraceString());
+ return resp;
+
+ }catch(Exception e) {
System.debug('into catch'+e.getMessage());
Database.rollback(sp);
resp.status = 'Exception';
--
Gitblit v1.9.1