From daa5a7e62d422ba024f645e00865e10694adb050 Mon Sep 17 00:00:00 2001
From: zhouyahui <zhouyh@mail2.tenwa.com.cn>
Date: Tue, 11 Sep 2018 12:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E9=87=91=E6=B5=8B=E7=AE=97=E5=B0=BE?=
 =?UTF-8?q?=E6=AC=BE=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp       | 2 +-
 calc/com/tenwa/reckon/help/RentalServiceImpl.java             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
index c2d742fd0..1f28d5b0c 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
@@ -157,7 +157,7 @@
 	String sButtons[][] = {
 		//{"true","All","Button","重置","重置","reloadSelf()","","","",""},
 		{"true","","Button","租金测算","租金测算","saveRecord()","","","","btn_icon_save"},
-		{((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"}
+		//{((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"}
 	};
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
diff --git a/calc/com/tenwa/reckon/help/RentalServiceImpl.java b/calc/com/tenwa/reckon/help/RentalServiceImpl.java
index 4eb613d5a..dc6349649 100644
--- a/calc/com/tenwa/reckon/help/RentalServiceImpl.java
+++ b/calc/com/tenwa/reckon/help/RentalServiceImpl.java
@@ -71,7 +71,7 @@ public class RentalServiceImpl {
 		if(cb.getRentOrRate() != null && cb.getRentOrRate().equals("rent")){
 			rent = cb.getRentValue().toString();
 		}else{
-			BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment());
+			BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment()==null?"0":cb.getFinalPayment());
 			if(finalPayment.compareTo(BigDecimal.ZERO) != 0) {
 				if(cb.getDeferStr()){
 					rent = new BigDecimal(RentTools.getPMT(preRate, cb.getIncomeNumber() + "", cleanLeaseMoney, "0", cb.getPeriodType())).toString();
@@ -201,7 +201,7 @@ public class RentalServiceImpl {
 	 * @return
 	 */
 	public List<String> getNormalRentList(ConditionBean cb, List<String> rent_list, String rent) {
-		BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment());
+		BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment()==null?"0":cb.getFinalPayment());
 		for (int i = 0; i < cb.getIncomeNumber(); i++) {
 			if(i == cb.getIncomeNumber() - 1 && finalPayment.compareTo(BigDecimal.ONE) != 0 && "final_payment_method02".equals(cb.getFinalPaymentMethod())) {
 				rent_list.add(finalPayment.add(new BigDecimal(rent)).toString());