From 51fb56f3f5b0dc96d7f93a71f9b61263e303243f Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期二, 10 五月 2022 15:12:45 +0800
Subject: [PATCH] Fix Edit Record Without AWSId

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

diff --git a/force-app/main/default/classes/NewAndEditCaseController.cls b/force-app/main/default/classes/NewAndEditCaseController.cls
index dd6c070..205d7de 100644
--- a/force-app/main/default/classes/NewAndEditCaseController.cls
+++ b/force-app/main/default/classes/NewAndEditCaseController.cls
@@ -32,6 +32,7 @@
     public final string ApiPrefix{get;private set;} //Add By Yin Mingjie 20220404
     public Map<string,string> AWSToSobjectEncryptedMap{get;private set;}
     public string AWSToSobjectEncryptedMapJson{get{return JSON.serialize(AWSToSobjectEncryptedMap);}}
+    public String sfRecordIdForEdit{set;get;}//Add By LiJun for Edit Record from NFM609, 20220510
     public NewAndEditCaseController(ApexPages.StandardController controller) {
         isNewMode = true;
         isCloneMode = false;
@@ -56,6 +57,7 @@
             Case caseData = [select Id,RecordTypeId,AWS_Data_Id__c,ContactId,Contact.AWS_Data_Id__c from Case where id =: obj.Id];
             rtTypeId = caseData.RecordTypeId;
             AWSDataId = caseData.AWS_Data_Id__c;
+            sfRecordIdForEdit = obj.Id;//Add By LiJun for Edit Record from NFM609, 20220510
             System.debug('AWSDataId=' + AWSDataId);
             Map<String,String> sfIdToAWSIdMap = new Map<String,String>();
             if(caseData.ContactId != null){
@@ -149,16 +151,19 @@
         Savepoint sp = Database.setSavepoint();
         String rid = '';
         String awsDataId = '';
+        String sfRecordId = '';
         Boolean isClone = false;
         try{
             System.debug('abcde');
             awsDataId = (String)caseInfo.get('AWS_Data_Id__c');
+            sfRecordId = (String)caseInfo.get('Id');
             System.debug('awsDataId = ' + awsDataId);
-            Case[] cases = [select id from Case where AWS_Data_Id__c =:awsDataId];
+            Case[] cases = [select id from Case where AWS_Data_Id__c =:awsDataId or id =:sfRecordId];
 
             if(!isNew){
                 isClone = cases.size() == 0;
             }
+            system.debug('isClone'+isClone + ' isNew'+isNew);
             if(isNew || isClone){
                 System.debug('caseInfozhj = ' + caseInfo);
                 if(!Test.isRunningTest()){

--
Gitblit v1.9.1