From a0094c618a4d474fda50f57fc7c4f22901bf0c70 Mon Sep 17 00:00:00 2001 From: lijun Date: Sat, 19 Oct 2024 23:53:44 +0800 Subject: [PATCH] update code --- .../yanzhu/system/controller/SysUserController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java index f36b14ec..15082286 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java @@ -234,17 +234,23 @@ public class SysUserController extends BaseController { List roles = roleService.selectRoleAll(); ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); ajax.put("posts", postService.selectPostAll()); + SysUser user=null; if (StringUtils.isNotNull(userId)) { SysUser sysUser; if (SysUser.isAdmin(userId)) { sysUser = userService.selectUserById(userId); } else { - SysUser user = userService.selectUserByUserId(userId); + user = userService.selectUserByUserId(userId); sysUser = userService.selectUserByIdAndDept(userId, user.getDeptId()); } - ajax.put(AjaxResult.DATA_TAG, sysUser); + if(sysUser!=null) { + ajax.put(AjaxResult.DATA_TAG, sysUser); + ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); + }else{ + ajax.put(AjaxResult.DATA_TAG,user); + } ajax.put("postIds", postService.selectPostListByUserId(userId)); - ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); + } return ajax; }