|
|
|
@ -27,6 +27,7 @@ import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
import java.util.Objects; |
|
|
|
import java.util.Optional; |
|
|
|
import java.util.concurrent.atomic.AtomicInteger; |
|
|
|
|
|
|
|
@Service |
|
|
|
@ -112,13 +113,13 @@ public class AdminSearchExamRecordDomainServiceImpl implements AdminSearchExamRe |
|
|
|
dto.setPassText(ExamRecordPassTextEnum.Fail.getValue()); |
|
|
|
dto.setPassHtml(ExamRecordPassTextEnum.Fail.getHtml()); |
|
|
|
} |
|
|
|
|
|
|
|
TaskUserEntity taskUser = taskUserBaseService.getById(dto.getTaskUserId()); |
|
|
|
if (taskUser != null){ |
|
|
|
TaskUserDTO taskUserDTO = taskUserBaseService.getById(dto.getTaskUserId()).toDTO(TaskUserDTO::new); |
|
|
|
dto.setUserName(taskUserDTO.getUserName()); |
|
|
|
dto.setUserName(""); |
|
|
|
if (Objects.nonNull(dto.getTaskUserId())) { |
|
|
|
TaskUserEntity taskUserEntity = taskUserBaseService.getById(dto.getTaskUserId()); |
|
|
|
dto.setUserName(Optional.ofNullable(taskUserEntity).map(TaskUserEntity::getUserName).orElse("")); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return dto; |
|
|
|
} |
|
|
|
|
|
|
|
|