From 2f183a6b0a83ec3f7d35375d5d25d200efc2a3e1 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期二, 19 四月 2022 18:46:18 +0800
Subject: [PATCH] 20220419FixIssue

---
 force-app/main/default/classes/NewAndEditReportController.cls |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/force-app/main/default/classes/NewAndEditReportController.cls b/force-app/main/default/classes/NewAndEditReportController.cls
index eec19b4..9481521 100644
--- a/force-app/main/default/classes/NewAndEditReportController.cls
+++ b/force-app/main/default/classes/NewAndEditReportController.cls
@@ -140,7 +140,17 @@
                 contactAWSDataId1 = '鏃�';
                 contactName1 = '鏃�';
             }
-        }else if(ApexPages.currentPage().getParameters().get('CF00N10000008ps6d_lkid') != null){
+        }else{
+            //鏂板缓
+            // Map<string,string> mso = ApexPages.currentPage().getParameters();
+            //鍖婚櫌/绉戝/缁忛攢鍟�(鎵嬪啓)
+            if(mso.containsKey('00N10000002GE3Z')){
+                controller.getRecord().put('Manual_Name__c',mso.get('00N10000002GE3Z'));
+            }
+            rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
+            obj.put('OwnerId',UserInfo.getUserId());
+        }
+        if(ApexPages.currentPage().getParameters().get('CF00N10000008ps6d_lkid') != null){
             //OPD璁″垝杩囨潵鐨勶紝閫氳繃Id鏌ュ嚭鍊熷嚭澶囧搧鐢宠No1杩涜灞曠ず
             String opdPlanId = ApexPages.currentPage().getParameters().get('CF00N10000008ps6d_lkid');
             if(String.isNotEmpty(opdPlanId)&&String.isNotBlank(opdPlanId)){
@@ -153,17 +163,10 @@
                     }                   
                 }
             }                                  
-            rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
-            obj.put('OwnerId',UserInfo.getUserId());
-        }else{
-            //鏂板缓
-            // Map<string,string> mso = ApexPages.currentPage().getParameters();
-            //鍖婚櫌/绉戝/缁忛攢鍟�(鎵嬪啓)
-            if(mso.containsKey('00N10000002GE3Z')){
-                controller.getRecord().put('Manual_Name__c',mso.get('00N10000002GE3Z'));
-            }
-            rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
-            obj.put('OwnerId',UserInfo.getUserId());
+        }
+        //OPD璁″垝
+        if(mso.containsKey('CF00N10000008ps6d_lkid')){
+            controller.getRecord().put('Report_OPDPlan__c',mso.get('CF00N10000008ps6d_lkid'));
         }
         LayoutDescriberHelper.LayoutWrapper LayoutWrapperValue = LayoutDescriberHelper.describeSectionWithFieldsWrapper(rtTypeId, 'Report__c','classic');
         layoutSections = LayoutWrapperValue.layoutSections;

--
Gitblit v1.9.1