浏览代码

优化无用户编号不校验数据权限

RuoYi 1 年之前
父节点
当前提交
bec5600f16

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -196,18 +196,18 @@ public class SysUserController extends BaseController
196
     @GetMapping(value = { "/", "/{userId}" })
196
     @GetMapping(value = { "/", "/{userId}" })
197
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
197
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
198
     {
198
     {
199
-        userService.checkUserDataScope(userId);
200
         AjaxResult ajax = AjaxResult.success();
199
         AjaxResult ajax = AjaxResult.success();
201
-        List<SysRole> roles = roleService.selectRoleAll();
202
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
203
-        ajax.put("posts", postService.selectPostAll());
204
         if (StringUtils.isNotNull(userId))
200
         if (StringUtils.isNotNull(userId))
205
         {
201
         {
202
+            userService.checkUserDataScope(userId);
206
             SysUser sysUser = userService.selectUserById(userId);
203
             SysUser sysUser = userService.selectUserById(userId);
207
             ajax.put(AjaxResult.DATA_TAG, sysUser);
204
             ajax.put(AjaxResult.DATA_TAG, sysUser);
208
             ajax.put("postIds", postService.selectPostListByUserId(userId));
205
             ajax.put("postIds", postService.selectPostListByUserId(userId));
209
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
206
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
210
         }
207
         }
208
+        List<SysRole> roles = roleService.selectRoleAll();
209
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
210
+        ajax.put("posts", postService.selectPostAll());
211
         return ajax;
211
         return ajax;
212
     }
212
     }
213
 
213