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

This commit is contained in:
疯狂的狮子Li
2024-03-11 16:35:10 +08:00
parent b6946b1ed6
commit 76586e0fee

View File

@@ -207,7 +207,10 @@ public class RemoteUserServiceImpl implements RemoteUserService {
loginUser.setMenuPermission(permissionService.getMenuPermission(userVo.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(userVo.getUserId()));
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());
List<SysRoleVo> roles = roleService.selectRolesByUserId(userVo.getUserId());
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));