jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xd
lijun 2024-10-19 23:53:44 +08:00
parent 396c18b2ff
commit a0094c618a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java
View File

@ -234,17 +234,23 @@ public class SysUserController extends BaseController {
List<SysRole> roles = roleService.selectRoleAll(); List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll()); ajax.put("posts", postService.selectPostAll());
SysUser user=null;
if (StringUtils.isNotNull(userId)) { if (StringUtils.isNotNull(userId)) {
SysUser sysUser; SysUser sysUser;
if (SysUser.isAdmin(userId)) { if (SysUser.isAdmin(userId)) {
sysUser = userService.selectUserById(userId); sysUser = userService.selectUserById(userId);
} else { } else {
SysUser user = userService.selectUserByUserId(userId); user = userService.selectUserByUserId(userId);
sysUser = userService.selectUserByIdAndDept(userId, user.getDeptId()); 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("postIds", postService.selectPostListByUserId(userId));
ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
} }
return ajax; return ajax;
} }