From 476df3117b19d81d750a09d5bfbac7fbeece0beb Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十二月 2020 10:04:54 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/utils/request.js | 2 +-
ruoyi-ui/src/utils/permission.js | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js
index ceca18f..bd4c066 100644
--- a/ruoyi-ui/src/utils/permission.js
+++ b/ruoyi-ui/src/utils/permission.js
@@ -9,9 +9,10 @@
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 @@
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 @@
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 e7e6519..ae89f24 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -25,7 +25,7 @@
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 + ']';
--
Gitblit v1.9.3