Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java ruoyi-ui/src/views/system/dept/index.vue
5 years ago · cf44d1f213
parent 30d15afd33 7de2cf77b4
commit cf44d1f213
2 changed files with 2 additions and 2 deletions
--- 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));
    }
 }
--- 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: [
          {