From 1031ba44b7a8652fecd58aecdb959be4d809dfa5 Mon Sep 17 00:00:00 2001 From: Nguyendream <728115857@qq.com> Date: 星期三, 14 七月 2021 14:38:56 +0800 Subject: [PATCH] fix 未完全解决的代码生成字典问题 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 0059993..a67615f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -204,12 +204,12 @@ @GetMapping("/authRole/{userId}") public AjaxResult authRole(@PathVariable("userId") Long userId) { - AjaxResult ajax = AjaxResult.success(); SysUser user = userService.selectUserById(userId); List<SysRole> roles = roleService.selectRolesByUserId(userId); + Map<String, Object> ajax = new HashMap<>(); ajax.put("user", user); ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); - return ajax; + return AjaxResult.success(ajax); } /** -- Gitblit v1.9.3