From aa28f97191fdc378a2e2f4ce9984766da6031192 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 10 Aug 2018 17:20:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=A7=9F=E9=87=91=E6=B5=8B?= =?UTF-8?q?=E7=AE=97=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E3=80=82?= =?UTF-8?q?=202.=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7=E4=BA=92=E6=96=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp | 4 ++-- .../Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp | 6 ++++-- WebContent/WEB-INF/etc/app/component/component-config.xml | 2 +- calc/com/tenwa/reckon/copydata/CalcRentCompare.java | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 326ff7a42..0cc57cbc4 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -64,10 +64,10 @@ JBOTransaction tx=JBOFactory.createJBOTransaction(); if("proj_process".equals(calType)){ BizObject proj=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); - sSerialType=proj.getAttribute("PROJECT_NO").getString(); + sSerialType=(proj==null)?"":proj.getAttribute("PROJECT_NO").getString(); }else{ BizObject contract=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); - sSerialType=contract.getAttribute("CONTRACT_NO").getString(); + sSerialType=(contract==null)?"":contract.getAttribute("CONTRACT_NO").getString(); } plannumber=SerialNumberUtil.getPlannumber(sSerialType,calType,tx); tx.commit(); diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index 1c2095dce..055396584 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -43,7 +43,8 @@ if(rightType.equals("ReadOnly")){ dwTemp.ReadOnly = "1";//只读模式 } - dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); + String id=CurPage.getParameter("id"); + dwTemp.genHTMLObjectWindow(id); CurPage.getCurComp().setAttribute("RightType", rightType); %> <%/*~END~*/%> @@ -74,9 +75,10 @@ var accType = getItemValue(0, 0, "acc_type"); var state = getItemValue(0, 0, "state_"); var FbSdk = getItemValue(0,0,"FbSdk"); + var id="<%=id%>"; var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk; var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams ); - if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")){ + if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")||sReturn==id){ as_save("myiframe0","parent.AsDialog.ClosePage()"); }else{ alert("启用状态下的账户账号类型已存在，请检查！"); diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 5bd437301..6e8eabade 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -1097,7 +1097,7 @@ - + diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java index 3d8bb8e49..4e3bdbeeb 100644 --- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java +++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java @@ -55,7 +55,7 @@ public class CalcRentCompare implements BizObjectCompare{ if(bo==null||"".equals(bo)){ return "null"; } - return "notNull"; + return bo.getAttribute("id").toString(); } }