将isAdmin方法统一到SecurityUtils

RuoYi

2026-01-05 1c0562ba18786d00e68fe96a0704e1e6a1f52d77

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java

@@ -355,7 +355,7 @@
    public boolean hasPermi(Collection<String> authorities, String permission)

    {

        return authorities.stream().filter(StringUtils::hasText)

                .anyMatch(x -> ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(x, permission));

                .anyMatch(x -> ALL_PERMISSION.equals(x) || PatternMatchUtils.simpleMatch(x, permission));

    }



    /**

@@ -368,6 +368,6 @@
    public boolean hasRole(Collection<String> roles, String role)

    {

        return roles.stream().filter(StringUtils::hasText)

                .anyMatch(x -> SUPER_ADMIN.contains(x) || PatternMatchUtils.simpleMatch(x, role));

                .anyMatch(x -> SUPER_ADMIN.equals(x) || PatternMatchUtils.simpleMatch(x, role));

    }

}