From a16ae7dadc204beafefde99af82918d3fbe9a5d6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 17 三月 2022 12:32:51 +0800
Subject: [PATCH] !156 修复角色、岗位、字典数据在PostgreSQL执行插入或者更新SQL报错问题，修改对应实体类的排序属性为Integer类型。 Merge pull request !156 from KonBAI/sort_type
---
ruoyi-ui/src/utils/permission.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js
index 70d1cf3..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) {
--
Gitblit v1.9.3