From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新

---
 force-app/main/default/classes/NewAndEditASEActivityController.cls |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/classes/NewAndEditASEActivityController.cls b/force-app/main/default/classes/NewAndEditASEActivityController.cls
index 2196438..0e4b20d 100644
--- a/force-app/main/default/classes/NewAndEditASEActivityController.cls
+++ b/force-app/main/default/classes/NewAndEditASEActivityController.cls
@@ -14,10 +14,15 @@
     public String contactId{set;get;}//For Lookup field
     public String contactAWS{set;get;}
     public String staticResourceContact {get; set;}
+    //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+    public String staticResourceV2 {get; set;}
+    //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
     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,14 +36,19 @@
         //鑾峰彇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'));
+        //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+        staticResourceV2 = JSON.serialize(PIHelper.getPIIntegrationInfo('ASEActivity__cV2'));
+        //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
     }
 
     

--
Gitblit v1.9.1