From e148b32a9af46115db928bdc3be1c2e2bbbc556e Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 31 May 2019 17:58:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8D=A1=E5=B0=94=E7=BB=8F?= =?UTF-8?q?=E9=94=80=E5=95=86=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/Flow/Comm/LBContractEnd/LoanNoticeList.jsp | 6 +++++- .../ContractApproval/ContractApprovalApplyList.jsp | 2 +- .../ContractCancle/ContractCancelApplyList.jsp | 6 +++++- .../ContractChange/ContractChangeApplyList_Car.jsp | 2 +- .../MortgageFile/MortgageFileApplyList.jsp | 9 ++++++++- .../Flow/Fund/FundPayment/FundPaymentApplyList.jsp | 2 +- .../Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp | 12 +++--------- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LoanNoticeList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LoanNoticeList.jsp index 02dff4ee4..2eb107a51 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LoanNoticeList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LoanNoticeList.jsp @@ -20,7 +20,11 @@ ASObjectModel doTemp = new ASObjectModel("LoanNoticeList"); if(userId.indexOf("8006")>-1){ falg = "false"; - doTemp.appendJboWhere(" and lci.inputuserid='"+userId+"'"); + if("8006011".equals(orgId)){ + doTemp.appendJboWhere(" and lci.inputorgid='"+orgId+"'"); + }else{ + doTemp.appendJboWhere(" and lci.inputuserid='"+userId+"'"); + } } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp index e47d28bf0..d2833ec6d 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp @@ -21,7 +21,7 @@ selname="SelectProjectForContract_Car"; businessType="1"; //卡尔 - if(getorgid=="8006009"){ + if(getorgid=="8006011"){ selname="SelectProjectForContract_Car_KE"; param="orgid,"+getorgid; } diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp index 68f09eff6..aac581a79 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp @@ -19,7 +19,11 @@ } if(flowno=="BContractCancelApply"){ selname="SelectContract_Car"; - parm="userid,"+userid; + parm="userid,"+userid; + if(orgId=="8006011"){ + selname="SelectContract_Car_KE"; + parm="orgid,"+orgId; + } }else{ selname="SelectContract"; parm="businessType,"+businessType+",userid,"+userid; diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp index 6355d72ce..42d30fc17 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp @@ -10,7 +10,7 @@ var userid="<%=CurUser.getUserID()%>"; var orgid="<%=CurUser.getOrgID()%>"; //卡尔 - if(orgid=="8006009"){ + if(orgid=="8006011"){ selname="SelectContractCar_KE"; param="orgid,"+orgid; } diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/MortgageFileApplyList.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/MortgageFileApplyList.jsp index 384638273..f5c511d7a 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/MortgageFileApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/MortgageFileApplyList.jsp @@ -6,7 +6,14 @@ /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/ function newApply() { var userid="<%=CurUser.getUserID()%>"; - AsDialog.OpenSelector("SelectLbContractInfoQC","userid,"+userid,"dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + var orgId="<%=CurUser.getOrgID()%>"; + var selname="SelectLbContractInfoQC"; + var param="userid,"+userid; + if(orgId=="8006011"){ + selname="SelectLbContractInfoQC_KE"; + param="orgid,"+orgId; + } + AsDialog.OpenSelector(selname,param,"dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ //alert(getHtmlMessage('1'));//请选择一条信息！ return; diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp index 7fcc55781..5dfe22c5f 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp @@ -9,7 +9,7 @@ var selName="SelectContractPayment"; var param="userid,"+userid; //卡尔 - if(orgid=="8006009"){ + if(orgid=="8006011"){ selName="SelectContractPayment_KE"; param="orgid,"+orgid; } diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp index 952b660d4..fd7f0902b 100644 --- a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp @@ -16,19 +16,13 @@ String orgId =CurUser.getOrgID(); System.out.print(orgId); String falg = "true"; - if(userId.indexOf("8006")>-1){ - falg = "false"; - } + String compClientID = request.getParameter("CompClientID"); // ASObjectModel doTemp = new ASObjectModel("RentNotify"); ASObjectModel doTemp = new ASObjectModel("RnetList"); if(userId.indexOf("8006")>-1){ - /* if("8006004".equals(CurUser.getOrgID())){ - doTemp.appendJboWhere(" O.orgid in ('8006005','8006006')"); - }else{ - doTemp.appendJboWhere(" O.orgid="+CurUser.getOrgID()+""); - } */ - doTemp.appendJboWhere(" O.orgid="+CurUser.getOrgID()+""); + falg = "false"; + doTemp.appendJboWhere(" O.orgid="+orgId+""); } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格--