From 29ec8b29f26b7d4b92cc75820ca7988d464c0185 Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 29 三月 2022 13:39:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/NewAndEditASEActivityController.cls | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/NewAndEditASEActivityController.cls b/force-app/main/default/classes/NewAndEditASEActivityController.cls
index 2196438..01ebee4 100644
--- a/force-app/main/default/classes/NewAndEditASEActivityController.cls
+++ b/force-app/main/default/classes/NewAndEditASEActivityController.cls
@@ -17,7 +17,9 @@
public NewAndEditASEActivityController(ApexPages.StandardController controller) {
List<String> fieldList = new List<String>(Schema.getGlobalDescribe().get('ASEActivity__c').getDescribe().fields.getMap().keyset());
// Add fields to controller. This is to avoid the SOQL error in visualforce page
- controller.addFields(fieldList);
+ if (!Test.isRunningTest()) {
+ controller.addFields(fieldList);
+ }
LookUpOverrideFields.add('ReporterASE__c');
Init(controller.getRecord());
@@ -31,12 +33,14 @@
//鑾峰彇contact 鍔犲瘑ID
// contactsInfo = LookUpOverrideFieldsMapJson;
//contact淇℃伅锛堟悳绱㈡煡璇uery url鐢級
- ASEActivity__c aseActivity = [Select Id, ReporterASE__c From ASEActivity__c Where Id = : obj.Id];
- if(aseActivity.ReporterASE__c != null){
- Contact contact = [Select Id, AWS_Data_Id__c From Contact Where Id = : aseActivity.ReporterASE__c];
- System.debug('contact : ' + contact );
- contactAWS = contact.AWS_Data_Id__c;
- System.debug('contactAWS : ' + contactAWS );
+ if(obj.Id != null){
+ ASEActivity__c aseActivity = [Select Id, ReporterASE__c From ASEActivity__c Where Id = : obj.Id];
+ if(aseActivity.ReporterASE__c != null){
+ Contact contact = [Select Id, AWS_Data_Id__c From Contact Where Id = : aseActivity.ReporterASE__c];
+ System.debug('contact : ' + contact );
+ contactAWS = contact.AWS_Data_Id__c;
+ System.debug('contactAWS : ' + contactAWS );
+ }
}
staticResourceContact = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));
}
--
Gitblit v1.9.1