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(); }