From 142ea4f7d4a15c4c659e07faa159701a21ae6c60 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Tue, 28 May 2019 13:39:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E9=87=91=E5=89=A9=E4=BD=99=E9=A2=9D=E5=BA=A6=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src_sys/com/tenwa/flow/action/comm/SelectBalance.java          | 3 +++
 .../com/tenwa/collectaudit/cache/CollectAuditInfoCache.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src_sys/com/tenwa/flow/action/comm/SelectBalance.java b/src_sys/com/tenwa/flow/action/comm/SelectBalance.java
index ae06d4778..8d81e103b 100644
--- a/src_sys/com/tenwa/flow/action/comm/SelectBalance.java
+++ b/src_sys/com/tenwa/flow/action/comm/SelectBalance.java
@@ -49,6 +49,9 @@ public class SelectBalance {
 		BigDecimal mm = new BigDecimal("0");
 		if(getSql.size()>0){
 			money=getSql.get(0).get("money");
+			if("".equals(money)||money==null){
+				return "ERROR@经销商没有保证金";
+			}
 			mm = mm.add(new BigDecimal(money));
 			if(mm.subtract(new BigDecimal(caution_money)).doubleValue()>=0){
 				return "SUCCESS@"+mm.subtract(new BigDecimal(caution_money)).doubleValue();
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index 7f03ad48b..fe86a9077 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -569,7 +569,7 @@ public class CollectAuditInfoCache {
 			bod.setAttributeValue("INPUTORGID",inputorgid);
 			bd.saveObject(bod);
 			//修改经销商信息表里的金额
-			bdi.createQuery("update O set O.sum="+account_balance+" where O.distributor_no=:distributor_id").setParameter("distributor_id", distributor_id).executeUpdate();
+			bdi.createQuery("update O set O.sums='"+account_balance+"' where O.distributor_no=:distributor_id").setParameter("distributor_id", distributor_id).executeUpdate();
 		}
 		
 		return "总共有 "+i+" 笔租金收款成功\n"+j+" 笔租金收款失败";