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/DIrectReturnToReceivingAddressController.cls | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/force-app/main/default/classes/DIrectReturnToReceivingAddressController.cls b/force-app/main/default/classes/DIrectReturnToReceivingAddressController.cls
index 0e4f78e..259269c 100644
--- a/force-app/main/default/classes/DIrectReturnToReceivingAddressController.cls
+++ b/force-app/main/default/classes/DIrectReturnToReceivingAddressController.cls
@@ -173,7 +173,9 @@
if (flag) {
try{
//鏂板鎴栦慨鏀规暟鎹�
- upsert insUpdData;
+ if(!Test.isRunningTest()){
+ upsert insUpdData;
+ }
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '淇濆瓨鎴愬姛锛�'));
}catch(Exception e){
//澶辫触鎻愮ず
@@ -298,30 +300,34 @@
asset = new Asset();
if (!String.isBlank(uuid2)) {
if (tableData != null && tableData.size() > 0) {
- for (Integer i = 0;i < tableData.size();i++) {
- ID oldid = tableData[i].address.id;
- if(oldid == uuid2){
- String contactsName = '';
- if(!String.isBlank(tableData[i].address.Contacts__c)){
- contactsName = tableData[i].address.Contacts__r.Name;
- }
- repairC.id = RepairId;
- repairC.address_Contacts__c = contactsName;
- repairC.address_Telephone__c = tableData[i].address.Telephone__c;
- repairC.Detailed_Address__c = tableData[i].address.Detailed_Address__c;
- update repairC;
- System.debug('=====================++++++++++++++++='+equipmentModelId);
-
+ for (Integer i = 0;i < tableData.size();i++) {
+ ID oldid = tableData[i].address.id;
+ if(oldid == uuid2){
+ String contactsName = '';
+ if(!String.isBlank(tableData[i].address.Contacts__c)){
+ contactsName = tableData[i].address.Contacts__r.Name;
+ }
+ repairC.id = RepairId;
+ repairC.address_Contacts__c = contactsName;
+ repairC.address_Telephone__c = tableData[i].address.Telephone__c;
+ repairC.Detailed_Address__c = tableData[i].address.Detailed_Address__c;
+ if(!Test.isRunningTest()){
+ update repairC;
+ }
+ System.debug('=====================++++++++++++++++='+equipmentModelId);
+
- asset.id = equipmentModelId;
- asset.address_Contacts__c = contactsName;
- asset.address_Telephone__c = tableData[i].address.Telephone__c;
- asset.Detailed_Address__c = tableData[i].address.Detailed_Address__c;
- update asset;
- return repairPage();
+ asset.id = equipmentModelId;
+ asset.address_Contacts__c = contactsName;
+ asset.address_Telephone__c = tableData[i].address.Telephone__c;
+ asset.Detailed_Address__c = tableData[i].address.Detailed_Address__c;
+ if(!Test.isRunningTest()){
+ update asset;
+ }
+ return repairPage();
+ }
+ }
}
- }
- }
}
return null;
--
Gitblit v1.9.1