fix
This commit is contained in:
parent
1563b63aa8
commit
9b8c07648e
@ -124,6 +124,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
|
|||||||
if(staffEntity1 !=null){
|
if(staffEntity1 !=null){
|
||||||
resultTaskDto.setAvatar(staffEntity1.getAvatar());
|
resultTaskDto.setAvatar(staffEntity1.getAvatar());
|
||||||
resultTaskDto.setStaffName(staffEntity1.getName());
|
resultTaskDto.setStaffName(staffEntity1.getName());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -148,7 +148,10 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
|
|||||||
Optional.ofNullable(staffEntity).ifPresent(staffEntity12 -> {
|
Optional.ofNullable(staffEntity).ifPresent(staffEntity12 -> {
|
||||||
dto.setAvatar(staffEntity12.getAvatar());
|
dto.setAvatar(staffEntity12.getAvatar());
|
||||||
dto.setStaffName(staffEntity12.getName());
|
dto.setStaffName(staffEntity12.getName());
|
||||||
|
StaffOccupationEntity staffOccupation= staffOccupationService.getStaffOccupationByStaffId(staffEntity12.getId());
|
||||||
|
Optional.ofNullable(staffOccupation).ifPresent(staffOccupationEntity -> dto.setPosition(staffOccupationEntity.getPosition()));
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user