fix 修复 用户未设置部门 登录报错问题

dev
疯狂的狮子Li 2 years ago
parent b6946b1ed6
commit 76586e0fee

@ -207,7 +207,10 @@ public class RemoteUserServiceImpl implements RemoteUserService {
loginUser.setMenuPermission(permissionService.getMenuPermission(userVo.getUserId())); loginUser.setMenuPermission(permissionService.getMenuPermission(userVo.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(userVo.getUserId())); loginUser.setRolePermission(permissionService.getRolePermission(userVo.getUserId()));
TenantHelper.dynamic(userVo.getTenantId(), () -> { TenantHelper.dynamic(userVo.getTenantId(), () -> {
SysDeptVo dept = deptService.selectDeptById(userVo.getDeptId()); SysDeptVo dept = null;
if (ObjectUtil.isNotNull(userVo.getUserId())) {
dept = deptService.selectDeptById(userVo.getDeptId());
}
loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName()); loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName());
List<SysRoleVo> roles = roleService.selectRolesByUserId(userVo.getUserId()); List<SysRoleVo> roles = roleService.selectRolesByUserId(userVo.getUserId());
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));

Loading…
Cancel
Save