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/NewAndEditLeadController.cls |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/classes/NewAndEditLeadController.cls b/force-app/main/default/classes/NewAndEditLeadController.cls
index 45342a8..c697da7 100644
--- a/force-app/main/default/classes/NewAndEditLeadController.cls
+++ b/force-app/main/default/classes/NewAndEditLeadController.cls
@@ -90,7 +90,7 @@
                     contactDataId = c.AWS_Data_Id__c;
                 }
                 //鏌ヨ鎴樼暐绉戝鍒嗙被
-                List<Contact> cs = [select Account.Department_Class__c from Contact where id='0030l00000mldeG'];
+                List<Contact> cs = [select Account.Department_Class__c from Contact where id=:contactId];
                 if(cs.size()>0){
                     controller.getRecord().put('Department_Class__c',cs[0].Account.Department_Class__c);
                 }
@@ -139,6 +139,9 @@
         //鑷畾涔夋牸寮忚浆鎹�
         for (String fieldAPI: fieldValueMap.keySet()) {
             system.debug('field API='+fieldAPI);
+            if(!fieldAPIToTypeMap.containskey(fieldAPI)){
+                continue;
+            }
             Schema.DisplayType fielddataType = fieldAPIToTypeMap.get(fieldAPI).getDescribe().getType();  
             String fieldValue = String.valueOf(fieldValueMap.get(fieldAPI)); 
             system.debug('Field Type:'+fielddataType+' field Value='+fieldValue);
@@ -152,7 +155,7 @@
                     leadInfo.put(fieldAPI, null);
                 }                    
             }else if(String.valueof(fielddataType)=='CURRENCY'|| String.valueof(fielddataType)=='PERCENT'||String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
-                leadInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?0:Decimal.valueOf(fieldValue)); 
+                leadInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?null:Decimal.valueOf(fieldValue.replace(',', ''))); 
             } else if(String.valueof(fielddataType)=='BOOLEAN'){
                 leadInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
             }else {

--
Gitblit v1.9.1