|
@@ -209,7 +209,7 @@ public class SysLoginService {
|
|
|
loginUser.setUserType(user.getUserType());
|
|
|
loginUser.setMenuPermission(permissionService.getMenuPermission(user));
|
|
|
loginUser.setRolePermission(permissionService.getRolePermission(user));
|
|
|
- loginUser.setDeptName(user.getDept().getDeptName());
|
|
|
+ loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());
|
|
|
List<RoleDTO> roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class);
|
|
|
loginUser.setRoles(roles);
|
|
|
return loginUser;
|