From 0bcf64c31ccc637ae01710948f734b3ac74ec376 Mon Sep 17 00:00:00 2001
From: tangft <32189@windows10.microdone.cn>
Date: Thu, 10 Jun 2021 17:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E5=8A=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calc/com/tenwa/reckon/executor/RentCalHelper.java      | 10 +++++++++-
 .../flow/project/businessapply/CheckGuaranteeUnit.java |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/calc/com/tenwa/reckon/executor/RentCalHelper.java b/calc/com/tenwa/reckon/executor/RentCalHelper.java
index 077a0ed13..599d8de64 100644
--- a/calc/com/tenwa/reckon/executor/RentCalHelper.java
+++ b/calc/com/tenwa/reckon/executor/RentCalHelper.java
@@ -364,7 +364,7 @@ public class RentCalHelper {
 	}
 	
 	public String rentPlanDate(){
-		JBOTransaction tx;
+		JBOTransaction tx = null;
 		try {
 			tx = JBOFactory.createJBOTransaction();
 			String sql = "SELECT CASE  WHEN  COUNT(*) > 0  THEN MAX(PLAN_DATE) ELSE 'null' END date FROM lc_rent_plan WHERE DATE_FORMAT(PLAN_DATE, '%Y/%m/%d') <= DATE_FORMAT('"+this.paydayAdjust+"', '%Y/%m/%d') AND contract_id =?";
@@ -380,6 +380,14 @@ public class RentCalHelper {
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
+		}finally {
+			try {
+				if(tx !=null) {
+					tx.commit();
+				}
+			} catch (JBOException e) {
+				e.printStackTrace();
+			}
 		}
 		return "error";
 		
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CheckGuaranteeUnit.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CheckGuaranteeUnit.java
index 13fedd030..7a974fb84 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CheckGuaranteeUnit.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CheckGuaranteeUnit.java
@@ -14,9 +14,9 @@ public class CheckGuaranteeUnit {
 	private String flowunid;
 	private int number;
 	
-	public String CheckGuaranteeUnitCount(JBOTransaction tx) throws SQLException{
+	public String CheckGuaranteeUnitCount(JBOTransaction tx) throws Exception{
 		Transaction Sqlca =null;
-		 Sqlca =  Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+		 Sqlca =  Transaction.createTransaction(tx);
 		 String sql="select count(1) as count from LB_GUARANTEE_UNIT_TEMP where FLOWUNID=:flowunid";
 		   SqlObject asql = new SqlObject(sql);
 		   asql.setParameter("flowunid", this.flowunid);