Merge remote-tracking branch 'origin/master'

jinquanOu

2024-06-11 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe

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

@@ -57,7 +57,9 @@
        // 管理员拥有所有权限
        if (user.isAdmin())
        {
            perms.add("*:*:*");
          //  perms.add("system:*:*");
            perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));

        }
        else
        {