From 60ad17fa8c56e8db504aa9a34a111b93015a3f29 Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Fri, 28 Sep 2018 16:16:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9=E5=AF=B9?= =?UTF-8?q?=E8=AF=9D=E6=A1=86=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=86=85=E5=AE=B9=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E5=90=8C=E5=8F=AA=E6=A0=B9=E6=8D=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=8F=E7=90=86=E5=81=9A=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Frame/page/tools/dialog/SelectCatalogGrid.jsp | 15 ++++++++++----- WebContent/fileTemplate/报价方案.xlsx | 0 .../comm/dataRightmanager/DataRightManager.java | 10 +++++----- 3 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 WebContent/fileTemplate/报价方案.xlsx diff --git a/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp b/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp index 74466d41f..1156c307b 100644 --- a/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp +++ b/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp @@ -113,11 +113,13 @@ //½«SqlÖеıäÁ¿ÓÃÏà¶ÔÓ¦µÄÖµÌæ»» StringTokenizer stArgs = new StringTokenizer(sParaString,","); + Map paramap = new HashMap(); while (stArgs.hasMoreTokens()) { try{ String sArgName = stArgs.nextToken().trim(); String sArgValue = stArgs.nextToken().trim(); - sSelCode = StringFunction.replace(sSelCode,"#"+sArgName,sArgValue ); + sSelCode = StringFunction.replace(sSelCode,"#"+sArgName,sArgValue ); + paramap.put(sArgName, sArgValue); }catch(NoSuchElementException ex){ throw new Exception("ÊäÈë²ÎÊý¸ñʽ´íÎó£¡"); } @@ -128,9 +130,12 @@ String[] params=param.split(","); if(params.length==2){ String sCondtion=DataRightManager.getRightConditionSelect(CurUser,params[0],params[1],"1"); - //sSelCode = StringFunction.replace(sSelCode,"{"+param+"}",sCondtion ); - //Æû³µÒµÎñ¾­ÏúÉÌ·¢ÆðûÓиúµ¥ÈËÔ±²»ÐèÒª¼ÓȨÏÞÌõ¼þ - sSelCode = StringFunction.replace(sSelCode,"{"+param+"}"," and 1=1 " ); + if("2".equals(paramap.get("businessType"))||"3".equals(paramap.get("businessType"))){ + sSelCode = StringFunction.replace(sSelCode,"{"+param+"}",sCondtion ); + }else{ + //Æû³µÒµÎñ¾­ÏúÉÌ·¢ÆðûÓиúµ¥ÈËÔ±²»ÐèÒª¼ÓȨÏÞÌõ¼þ + sSelCode = StringFunction.replace(sSelCode,"{"+param+"}"," and 1=1 " ); + } } } //ʵÀý»¯DataObject @@ -236,7 +241,7 @@ { doTemp.WhereClauseNoFilter+=" "+sAttribute4; } - + doTemp.WhereClauseNoFilter +=""; if(!sMutilOrSingle.equals("Single")) doTemp.multiSelectionEnabled=true; //ʵÀý»¯DataWindow diff --git a/WebContent/fileTemplate/报价方案.xlsx b/WebContent/fileTemplate/报价方案.xlsx new file mode 100644 index 000000000..e69de29bb diff --git a/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java b/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java index effa0c6d6..4abe253bc 100644 --- a/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java +++ b/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java @@ -60,11 +60,11 @@ public class DataRightManager { public static String getRightConditionByProj(ASUser curUser,String table) throws JBOException{ StringBuilder sb=new StringBuilder(" and ("); - sb.append(getRightCondition(curUser,table,"PROJECT_REGISTRAR","PROJECT_DEPT")) - .append(" or ") - .append(getRightCondition(curUser,table,"PROJECT_MANAGE","PROJECT_DEPT")) - .append(" or ") - .append(getRightCondition(curUser,table,"PROJECT_ASSIST","PROJECT_DEPT")) +// sb.append(getRightCondition(curUser,table,"PROJECT_REGISTRAR","PROJECT_DEPT")) +// .append(" or ") + sb.append(getRightCondition(curUser,table,"PROJECT_MANAGE","PROJECT_DEPT")) +// .append(" or ") +// .append(getRightCondition(curUser,table,"PROJECT_ASSIST","PROJECT_DEPT")) .append(")"); return sb.toString(); }