From cf44d1f213041489c4e86d33946e92881c6fdbd4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 十月 2020 11:54:52 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/system/dept/index.vue | 2 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
index 4ce8d8a..277e4b9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
@@ -164,6 +164,6 @@
*/
private boolean hasPermissions(Set<String> permissions, String permission)
{
- return permissions.contains(ALL_PERMISSION) || permissions.equals(StringUtils.trim(permission));
+ return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
}
}
diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue
index 93559af..25d92aa 100644
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -177,7 +177,7 @@
{ required: true, message: "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
orderNum: [
- { required: true, message: "鑿滃崟椤哄簭涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "鏄剧ず鎺掑簭涓嶈兘涓虹┖", trigger: "blur" }
],
email: [
{
--
Gitblit v1.9.3