同步开发代码

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamControlServiceImpl.java

@@ -515,11 +515,9 @@ public class ExamControlServiceImpl implements ExamControlService {
 
             //场次特殊设置开启但未配置，不允许考试
             if (examSettingsCacheBean.getSpecialSettingsType() == ExamSpecialSettingsType.STAGE_BASED) {
-                if (null != examStudent.getExamStageId()) {
-                    ExamStageCacheBean examStage = CacheHelper.getExamStage(examStudent.getExamId(), examStudent.getExamStageId());
-                    if (!examStage.getHasValue()) {
-                        throw new StatusException("100016", "场次配置未完成，不允许考试");
-                    }
+                ExamStagesCacheBean examStages = CacheHelper.getExamStages(examStudent.getExamId());
+                if (!examStages.getHasValue()) {
+                    throw new StatusException("100016", "场次配置未完成，不允许考试");
                 }
             }
         }
@@ -1168,11 +1166,9 @@ public class ExamControlServiceImpl implements ExamControlService {
 
                 //场次特殊设置开启但未配置，不允许考试
                 if (examBean.getSpecialSettingsType() == ExamSpecialSettingsType.STAGE_BASED) {
-                    if (null != examStageId) {
-                        ExamStageCacheBean examStage = CacheHelper.getExamStage(examId, examStageId);
-                        if (!examStage.getHasValue()) {
-                            throw new StatusException("2006", "场次配置未完成，不允许考试");
-                        }
+                    ExamStagesCacheBean examStages = CacheHelper.getExamStages(examId);
+                    if (!examStages.getHasValue()) {
+                        throw new StatusException("100016", "场次配置未完成，不允许考试");
                     }
                 }
             }