From 48b63cd225881ff158d833c4afeae865eac798df Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Fri, 8 Nov 2019 20:08:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7bug=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Comm/LBContractTemplate/contract_template.jsp  | 14 +++++++-------
 .../ActualPayment/ActualPaymentCarApplyList.jsp    |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
index 54379d42d..670b18bdf 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
@@ -343,6 +343,13 @@
 		}else{
 			RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdf","FlowUnid=<%=flowunid%>,flagType=word");
 <%-- 			if("01"=="<%=customertype%>"||"1"=="<%=CurPage.getParameter("isNetCar")%>"||"BAIC_MOTOR"=="<%=CurPage.getParameter("operationType")%>"||"ZYC"=="<%=CurPage.getParameter("operationType")%>"||"KHSQ"=="<%=CurPage.getParameter("operationType")%>"||"KJZL"=="<%=CurPage.getParameter("operationType")%>"){ --%>
+			var OwmMessage = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","SystemMakeOneDimensionalCode","ProjectId=<%=projectId%>,contract_id=<%=sContractId%>,contractNo=<%=contractNo%>,leasform=<%=leasform%>");
+			if("error"==OwmMessage){
+				RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","companyUpdateDocContractStatus","FlowUnid=<%=flowunid%>"+",ProjectId=<%=projectId%>");
+				alert("生成失败！！！");
+				reloadSelf();
+				return;
+			}
 			if(("01"=="<%=customertype%>"&&"Auto" == "<%=sealType%>" )||("Auto" == "<%=sealType%>" && "Hand" == "<%=signType%>" )){
 				var falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","compnySignIng","FlowUnid=<%=flowunid%>,flagType=word,ProjectId=<%=projectId%>");
 				if("success"!= falg ){
@@ -352,13 +359,6 @@
 					return;
 				}
 			}
-			var OwmMessage = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","SystemMakeOneDimensionalCode","ProjectId=<%=projectId%>,contract_id=<%=sContractId%>,contractNo=<%=contractNo%>,leasform=<%=leasform%>");
-			if("error"==OwmMessage){
-				RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","companyUpdateDocContractStatus","FlowUnid=<%=flowunid%>"+",ProjectId=<%=projectId%>");
-				alert("生成失败！！！");
-				reloadSelf();
-				return;
-			}
 			alert("生成成功");
 		}
 		reloadSelf();
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarApplyList.jsp
index 7e2098ba5..1a0e1c8cb 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarApplyList.jsp
@@ -5,6 +5,11 @@
 	<script type="text/javascript">
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply(){
+		var userID="<%=CurUser.getUserID()%>";
+		if("administrator" == userID){
+			AsDebug.showMessage("提示","当前用户不能发起申请！！","","",true);
+			return;
+		}
 		var result = AsControl.RunJsp("/Tenwa/Lease/Flow/Fund/ActualPayment/CheckApplyPassContract.jsp","");
 		if("false" == result){
 			AsDebug.showMessage("提示","没有需要放款的合同","","",true);