|
@@ -193,7 +193,7 @@ public class TCPaperStructController {
|
|
printCommonService.getLock(examId, courseCode, paperNumber);
|
|
printCommonService.getLock(examId, courseCode, paperNumber);
|
|
List<PaperStructDimensionResult> paperStructDimensionResultList = null;
|
|
List<PaperStructDimensionResult> paperStructDimensionResultList = null;
|
|
TCPaperStruct tcPaperStruct = tcPaperStructService.queryByExamIdAndCourseCodeAndPaperNumber(examId, courseCode, paperNumber);
|
|
TCPaperStruct tcPaperStruct = tcPaperStructService.queryByExamIdAndCourseCodeAndPaperNumber(examId, courseCode, paperNumber);
|
|
- if (Objects.isNull(tcPaperStruct) || Objects.isNull(tcPaperStruct.getPaperStruct())) {
|
|
|
|
|
|
+ if (Objects.isNull(tcPaperStruct) || (Objects.isNull(tcPaperStruct.getPaperStruct()) && Objects.isNull(tcPaperStruct.getPaperStructDimension()))) {
|
|
List<MarkQuestion> markQuestionList = markQuestionService.listQuestionByExamIdAndPaperNumberAndPaperType(examId, paperNumber, null);
|
|
List<MarkQuestion> markQuestionList = markQuestionService.listQuestionByExamIdAndPaperNumberAndPaperType(examId, paperNumber, null);
|
|
if (CollectionUtils.isEmpty(markQuestionList)) {
|
|
if (CollectionUtils.isEmpty(markQuestionList)) {
|
|
throw ExceptionResultEnum.ERROR.exception("未找到试卷结构");
|
|
throw ExceptionResultEnum.ERROR.exception("未找到试卷结构");
|