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

疯狂的狮子li

2020-10-23 30d15afd33a3d09ae4e56de2ef3762f1d6995078

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java

@@ -109,7 +109,7 @@
        for (SysRole sysRole : loginUser.getUser().getRoles())
        {
            String roleKey = sysRole.getRoleKey();
            if (SUPER_ADMIN.contains(roleKey) || roleKey.contains(StringUtils.trim(role)))
            if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role)))
            {
                return true;
            }
@@ -164,6 +164,6 @@
     */
    private boolean hasPermissions(Set<String> permissions, String permission)
    {
        return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
        return permissions.contains(ALL_PERMISSION) || permissions.equals(StringUtils.trim(permission));
    }
}