Browse Source

修复部分待考列表查成绩接口报错的bug

lideyin 5 years ago
parent
commit
014f77c944

+ 6 - 3
examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamScoreController.java

@@ -133,14 +133,17 @@ public class ExamScoreController extends ControllerSupport {
         }
 
         if (examRecordData.getIsIllegality() == null || !examRecordData.getIsIllegality()) {
-            if (examRecordData.getIsWarn() && !examRecordData.getIsAudit()) {
+            if ((null != examRecordData.getIsWarn() && !examRecordData.getIsWarn())
+                    || (null != examRecordData.getIsWarn() && examRecordData.getIsWarn()
+                    && null != examRecordData.getIsAudit() && examRecordData.getIsAudit())) {
                 objectiveScoreInfo.setIsAuditing(true);
-            } else if (!examRecordData.getIsWarn() || (examRecordData.getIsWarn() && examRecordData.getIsAudit())) {
-                objectiveScoreInfo.setIsAuditing(false);
 
                 //缓存中的分数是存储在临时考试记录表中的,所以需要从考试记录缓存中取
                 objectiveScoreInfo.setObjectiveScore(examRecordData.getObjectiveScore());
+            } else {
+                objectiveScoreInfo.setIsAuditing(false);
             }
+
             objectiveScoreInfo.setIsIllegality(false);
         } else {
             objectiveScoreInfo.setIsIllegality(true);