getOngoingExamList 跳过重复

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/OnGoingExamServiceImpl.java

@@ -69,28 +69,29 @@ public class OnGoingExamServiceImpl implements OnGoingExamService {
         for (ExamSpecialSettingsEntity cur : byExam) {
             if (!cur.getSpecialSettingsEnabled()) {
                 examList.add(cur);
+                continue;
             }
+
             ExamSpecialSettingsType specialSettingsType = cur.getSpecialSettingsType();
             if (null == specialSettingsType) {
                 examList.add(cur);
-            } else if (specialSettingsType.equals(ExamSpecialSettingsType.ORG_BASED)) {
+                continue;
+            }
+
+            if (specialSettingsType.equals(ExamSpecialSettingsType.ORG_BASED)) {
                 ExamSpecialSettingsEntity specialSettings = examSpecialSettingsRepo
-                        .findByExamIdAndOrgIdAndCourseIdIsNullAndStudentIdIsNull(cur.getExamId(),
-                                orgId);
+                        .findByExamIdAndOrgIdAndCourseIdIsNullAndStudentIdIsNull(cur.getExamId(), orgId);
                 if (null == specialSettings) {
                     examList.add(cur);
-                } else if (null == specialSettings.getBeginTime()
-                        && null == specialSettings.getEndTime()) {
+                } else if (null == specialSettings.getBeginTime() && null == specialSettings.getEndTime()) {
                     examList.add(cur);
                 }
             } else if (specialSettingsType.equals(ExamSpecialSettingsType.STUDENT_BASED)) {
                 ExamSpecialSettingsEntity specialSettings = examSpecialSettingsRepo
-                        .findByExamIdAndStudentIdAndOrgIdIsNullAndCourseIdIsNull(cur.getExamId(),
-                                studentId);
+                        .findByExamIdAndStudentIdAndOrgIdIsNullAndCourseIdIsNull(cur.getExamId(), studentId);
                 if (null == specialSettings) {
                     examList.add(cur);
-                } else if (null == specialSettings.getBeginTime()
-                        && null == specialSettings.getEndTime()) {
+                } else if (null == specialSettings.getBeginTime() && null == specialSettings.getEndTime()) {
                     examList.add(cur);
                 }
             } else if (specialSettingsType.equals(ExamSpecialSettingsType.STAGE_BASED)) {