From 093ba5b389e61f20e36d46ca1c34e24b5cd3a7ce Mon Sep 17 00:00:00 2001
From: tucke <tucke@qq.com>
Date: Mon, 26 Oct 2020 09:53:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/framework/web/service/PermissionService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f369807d..003c7942 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 @@ public class PermissionService
      */
     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));
     }
 }

From 2b9d46439fb9983fbde1de463af0c667f55b1eac Mon Sep 17 00:00:00 2001
From: FlyFive <826323891@qq.com>
Date: Mon, 26 Oct 2020 16:31:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20ruoyi-ui/src/views/system/dept/ind?=
 =?UTF-8?q?ex.vue.=20=E9=AA=8C=E8=AF=81=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/dept/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue
index 1a2b506e..c75b0555 100644
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -177,7 +177,7 @@ export default {
           { required: true, message: "部门名称不能为空", trigger: "blur" }
         ],
         orderNum: [
-          { required: true, message: "菜单顺序不能为空", trigger: "blur" }
+          { required: true, message: "显示排序不能为空", trigger: "blur" }
         ],
         email: [
           {