From 9d4afaf955278407be4bedfa1b6baded40ce9814 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 14:29:52 +0800
Subject: [PATCH] Merge branch 'master' into LEX_Deloitte_Dev
---
force-app/main/default/classes/SaleOrderController.cls | 110 ++----------------------------------------------------
1 files changed, 5 insertions(+), 105 deletions(-)
diff --git a/force-app/main/default/classes/SaleOrderController.cls b/force-app/main/default/classes/SaleOrderController.cls
index 8a4faf4..b96c747 100644
--- a/force-app/main/default/classes/SaleOrderController.cls
+++ b/force-app/main/default/classes/SaleOrderController.cls
@@ -222,13 +222,14 @@
List<hospitalprice__c> hpList = [select id,hospital__c,product__c from hospitalprice__c where account__c = :accountid];
if (hpList!= null && hpList.size() > 0) {
for (hospitalprice__c hp : hpList) {
- proIdMap.put((''+hp.product__c).subString(0,15)+'鏄�', '');
- if (hp.hospital__c ==coc.Order_ForHospital__c) {
- proHosMap.put((''+hp.product__c).subString(0,15)+'鏄�', '');
+ if(hp.product__c!=null && String.valueof(hp.product__c).length()>=15){//Add by Li Jun for issue fix 20230403
+ proIdMap.put((''+hp.product__c).subString(0,15)+'鏄�', '');
+ if (hp.hospital__c ==coc.Order_ForHospital__c) {
+ proHosMap.put((''+hp.product__c).subString(0,15)+'鏄�', '');
+ }
}
}
}
-
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'proIdMap '+ proIdMap));
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'proHosMap '+ proHosMap));
@@ -1202,106 +1203,5 @@
public Integer compareTo(Object compareTo) {
return null;
}
- }
-
- public void testUtil() {
- Integer i = 0;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
- i++;
}
}
\ No newline at end of file
--
Gitblit v1.9.1