Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-12 11af23e0c7976eed1211ba2ca0beae3a12e19310

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -74,7 +74,7 @@
        SysUser user = loginUser.getUser();
        //查询用户信息
        //TODO:重写查询用户信息sql
//        SysUserVO userInfo = userMapper.selectUserInfo(user.getUserId());
        SysUserVO userInfo = userMapper.selectUserInfo(user.getUserId());
        // 角色集合
        Set<String> roles = permissionService.getRolePermission(user);
        // 权限集合
@@ -85,7 +85,7 @@
            tokenService.refreshToken(loginUser);
        }
        AjaxResult ajax = AjaxResult.success();
        ajax.put("user", user);
        ajax.put("user", userInfo);
        ajax.put("roles", roles);
        ajax.put("permissions", permissions);
        return ajax;