|
@@ -144,9 +144,17 @@ public class SysUserController extends BaseController
|
|
|
{
|
|
|
SysUser sysUser = userService.selectUserById(userId);
|
|
|
setTenantId(sysUser);
|
|
|
+ SysDept sysDept = new SysDept();
|
|
|
+ sysDept.setTenantId(getTenantId());
|
|
|
+ List<SysDept> sysDeptList = deptService.selectDeptList(sysDept);
|
|
|
+ if(null != sysUser && sysUser.getDeptId() == 0L && !sysDeptList.isEmpty()){
|
|
|
+ sysUser.setDeptId(sysDeptList.get(0).getDeptId());
|
|
|
+ }
|
|
|
ajax.put(AjaxResult.DATA_TAG, sysUser);
|
|
|
ajax.put("postIds", postService.selectPostListByUserId(userId));
|
|
|
- ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
|
|
|
+ if (sysUser != null) {
|
|
|
+ ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
QueryWrapper<BizUserTenant> userTenantQueryWrapper = new QueryWrapper<>();
|
|
|
userTenantQueryWrapper.eq("user_id", sysUser.getUserId()).eq("tenant_id", sysUser.getTenantId());
|
|
|
BizUserTenant tenant = userTenantService.getOne(userTenantQueryWrapper);
|