diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java index ab2c9409..06575a3e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java @@ -59,8 +59,7 @@ public class PermissionDataAspect { requestPath = filterUrl(requestPath); //update-begin-author:taoyan date:20211027 for:JTC-132【online报表权限】online报表带参数的菜单配置数据权限无效 //先判断是否online报表请求 - // TODO 参数顺序调整有隐患 - if(requestPath.indexOf(UrlMatchEnum.CGREPORT_DATA.getMatchUrl())>=0){ + if(requestPath.indexOf(UrlMatchEnum.CGREPORT_DATA.getMatchUrl())>=0 || requestPath.indexOf(UrlMatchEnum.CGREPORT_ONLY_DATA.getMatchUrl())>=0){ // 获取地址栏参数 String urlParamString = request.getParameter(CommonConstant.ONL_REP_URL_PARAM_STR); if(oConvertUtils.isNotEmpty(urlParamString)){ @@ -68,7 +67,7 @@ public class PermissionDataAspect { } } //update-end-author:taoyan date:20211027 for:JTC-132【online报表权限】online报表带参数的菜单配置数据权限无效 - log.info("拦截请求 >> {} ; 请求类型 >> {} . ", requestPath, requestMethod); + log.debug("拦截请求 >> {} ; 请求类型 >> {} . ", requestPath, requestMethod); String username = JwtUtil.getUserNameByToken(request); //查询数据权限信息 //TODO 微服务情况下也得支持缓存机制 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java index c592ce4a..f7a0863c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java @@ -14,6 +14,8 @@ public enum UrlMatchEnum { CGFORM_TREE_DATA("/online/cgform/api/getTreeData/", "/online/cgformList/"), /**求URL与菜单路由URL转换规则 /online/cgreport/api/getColumnsAndData/ */ CGREPORT_DATA("/online/cgreport/api/getColumnsAndData/", "/online/cgreport/"), + /** 求URL与菜单路由URL转换规则/online/cgreport/api/getData/ 【vue3报表数据请求地址】 */ + CGREPORT_ONLY_DATA("/online/cgreport/api/getData/", "/online/cgreport/"), /**求URL与菜单路由URL转换规则 /online/cgreport/api/exportXls/ */ CGREPORT_EXCEL_DATA("/online/cgreport/api/exportXls/", "/online/cgreport/"), /**求URL与菜单路由URL转换规则 /online/cgreport/api/exportManySheetXls/ */