Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java

@@ -44,7 +44,7 @@
    @Override
    public Set<String> getMenuPermission(SysUser user) {
        Set<String> perms = new HashSet<String>();
        Long roleId = user.getSysRole().getRoleId();
        Long roleId = user.getRoleId();
        if (null == roleId) {
            perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
        } else {