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/NewQuoteIraiController.cls | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/NewQuoteIraiController.cls b/force-app/main/default/classes/NewQuoteIraiController.cls
index dbb1fbd..173ae57 100644
--- a/force-app/main/default/classes/NewQuoteIraiController.cls
+++ b/force-app/main/default/classes/NewQuoteIraiController.cls
@@ -104,12 +104,16 @@
// 璇环id
oppid = System.currentPageReference().getParameters().get('oppid');
+ //lastbuy 2022/3/10 fy start
QuoteIrai__c quoteiraiobj = new QuoteIrai__c();
if(oppid==null&&tenderid==null&&quoId!=null&&leadid==null&&agencyoppid==null){
quoteiraiobj = [select id,Note__c from QuoteIrai__c where id=:quoId];
- String[] quosub=quoteiraiobj.Note__c.split('/');
- oppid=quosub[quosub.size()-1];
+ if(quoteiraiobj.Note__c!=null){
+ String[] quosub=quoteiraiobj.Note__c.split('/');
+ oppid=quosub[quosub.size()-1];
+ }
}
+ //lastbuy 2022/3/10 fy start
system.debug('oppid:++++'+oppid);
// 鎶ヤ环id
String oppquoid = System.currentPageReference().getParameters().get('oppquoid');
@@ -1177,7 +1181,7 @@
if(!ReservedProductVerification()){
if(flglastbuy==1){
errorflg = true;
- errormessage = '棰勭暀浜у搧琛ㄤ腑娌℃湁褰曞叆璇ユ姤浠峰鎵樼殑棰勭暀浜у搧' ;
+ errormessage = '棰勭暀浜у搧琛ㄤ腑娌℃湁璇ヨ浠凤紝璇烽�氳繃鏈儴绐楀彛鑱旂郴钀ヤ笟绠＄悊璇�' ;
return false;
}else if(flglastbuy==2){
errorflg = true;
--
Gitblit v1.9.1