diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js index ceca18fb..bd4c066f 100644 --- a/ruoyi-ui/src/utils/permission.js +++ b/ruoyi-ui/src/utils/permission.js @@ -9,9 +9,10 @@ export function checkPermi(value) { if (value && value instanceof Array && value.length > 0) { const permissions = store.getters && store.getters.permissions const permissionDatas = value + const all_permission = "*:*:*"; const hasPermission = permissions.some(permission => { - return permissionDatas.includes(permission) + return all_permission === permission || permissionDatas.includes(permission) }) if (!hasPermission) { @@ -33,9 +34,10 @@ export function checkRole(value) { if (value && value instanceof Array && value.length > 0) { const roles = store.getters && store.getters.roles const permissionRoles = value + const super_admin = "admin"; const hasRole = roles.some(role => { - return permissionRoles.includes(role) + return super_admin === role || permissionRoles.includes(role) }) if (!hasRole) { @@ -46,4 +48,4 @@ export function checkRole(value) { console.error(`need roles! Like checkRole="['admin','editor']"`) return false } -} \ No newline at end of file +} diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index e7e65199..ae89f24d 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -25,7 +25,7 @@ service.interceptors.request.use(config => { for (const propName of Object.keys(config.params)) { const value = config.params[propName]; var part = encodeURIComponent(propName) + "="; - if (value && typeof(value) !== "undefined") { + if (value !== null && typeof(value) !== "undefined") { if (typeof value === 'object') { for (const key of Object.keys(value)) { let params = propName + '[' + key + ']';