From 617eea1ee2b2c133266bda30bdef5a85e8bf7a49 Mon Sep 17 00:00:00 2001
From: lixuebo <Administrator@PC-20171112XJND>
Date: Mon, 26 Aug 2019 14:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BA=92=E6=96=A5=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E8=BF=94=E5=9B=9E=E4=BA=92=E6=96=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=85=A5=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=E5=B0=86=E6=B5=81=E7=A8=8B=E4=BA=92=E6=96=A5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=85=A5=E5=88=B0objectno=E5=AD=97=E6=AE=B5=E4=B8=AD=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Flow/DealerDepositChargeApplyList.jsp     | 25 ++++++++++---------
 .../flow/action/comm/BaseFlowStartAction.java |  8 ++++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/WebContent/Flow/DealerDepositChargeApplyList.jsp b/WebContent/Flow/DealerDepositChargeApplyList.jsp
index 62d297890..1d3b6add3 100644
--- a/WebContent/Flow/DealerDepositChargeApplyList.jsp
+++ b/WebContent/Flow/DealerDepositChargeApplyList.jsp
@@ -17,19 +17,20 @@
 	    	var sParams = "applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
 	     	//sParams =sParams+",FlowKey="+distributor_coding+",ProjectId="+id+",ProjectName="+distributor_coding+"-"+distributor_name+",DistributorNo="+distributor_no;
 	     	sParams =sParams+",FlowKey="+distributor_no+",ProjectId="+id+",ProjectName="+distributor_coding+"-"+distributor_name+",DistributorNo="+distributor_no;
-			  var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
-			  if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
-			  var sReturnInfos=sReturnInfo.split("@");
-				if(sReturnInfos[0]=="success")
-			     {
-			  		var objectNo=sReturnInfos[1];
-			  		FlowFunction.openStartFlowPage(objectNo);
-			   }
-			 else
-			  {
-			  	 var mes=sReturnInfos[1];
+			var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
+			if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
+			var sReturnInfos=sReturnInfo.split("@");
+			if(sReturnInfos[0]=="success"){
+			  	var objectNo=sReturnInfos[1];
+			  	FlowFunction.openStartFlowPage(objectNo);
+			}else{
+			  	var mes=sReturnInfos[1];
+			  	if(mes==undefined){
+			  		alert(sReturnInfos);
+			  	}else{
 			  		alert(mes);
-			  }
+			  	}
+			 }
 			 reloadSelf();	
  		},"经销商保证金收取");
 	}
diff --git a/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java b/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java
index 5f81209db..b6d13ff0c 100644
--- a/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java
+++ b/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java
@@ -64,7 +64,8 @@ public class BaseFlowStartAction extends FlowBussionAction {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			tx.rollback();
-			return error_message;
+			return e.getMessage();
+			//return error_message;
 		}
 	}
 
@@ -272,7 +273,10 @@ public class BaseFlowStartAction extends FlowBussionAction {
 	 	    	}
 	 	    }
 		}
- 	    if(res.length()>0){res="当前流程和下面流程互斥不同时执行【"+res+"】";}
+ 	    if(res.length()>0){
+ 	    	res="当前流程和下面流程互斥不同时执行【"+res+"】";
+ 	    	throw new Exception(res);
+ 	    }
  	    return res;
 	}
 	/**