|
@@ -357,14 +357,18 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
examTaskDto.setCourseName(examTaskTemp.getCourseName());
|
|
|
examTaskDto.setPaperNumber(examTaskTemp.getPaperNumber());
|
|
|
examTaskDto.setSpecialty(examTaskTemp.getSpecialty());
|
|
|
- List<BlurryUserDto> blurryUserDtoList = new ArrayList<>();
|
|
|
- if (Objects.nonNull(examTaskTemp.getUserAccount()) && Objects.nonNull(examTaskTemp.getCourseCode())){
|
|
|
- QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.lambda().eq(SysUser::getLoginName, examTaskTemp.getUserAccount());
|
|
|
- SysUser sysUser1 = sysUserService.getOne(queryWrapper);
|
|
|
+ List<BlurryUserDto> blurryUserDtoList;
|
|
|
+
|
|
|
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.lambda().eq(SysUser::getLoginName, examTaskTemp.getUserAccount());
|
|
|
+ SysUser sysUser1 = sysUserService.getOne(queryWrapper);
|
|
|
+ if (sysUser1 != null){
|
|
|
blurryUserDtoList = listUsers(examTaskTemp.getCourseCode(), String.valueOf(sysUser1.getId()));
|
|
|
+ }else {
|
|
|
+ blurryUserDtoList = listUsers(examTaskTemp.getCourseCode(), null);
|
|
|
}
|
|
|
examTaskDto.setUsers(blurryUserDtoList);
|
|
|
+
|
|
|
// // 校验命题老师
|
|
|
// if (StringUtils.isBlank(examTaskTemp.getUserAccount())) {
|
|
|
// examTaskDto.setUsers(listUsers(examTaskTemp.getCourseCode(), null));
|