From 37b90343ae178a6a9f53690073e82f6d55be6174 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 10 Feb 2023 00:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=95=B0=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ibeetl/jlw/service/GeneralQuestionLogService.java     | 4 ++--
 .../jlw/service/TeacherOpenCourseQuestionLogService.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
index 04aa1a9d..30107b00 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
@@ -848,8 +848,8 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
             sumSuccessCount += successCount;
             sumErrorCount += errorCount;
             sumDoCount += ObjectUtil.isNotEmpty(questionLog.getGeneralQuestionLogAnswer()) ? 1 : 0;
-            questionTotalScore = questionTotalScore.add(questionLog.getQuestionScore());
-            myTotalScore = myTotalScore.add(questionLog.getStudentScore());
+            questionTotalScore = questionTotalScore.add(defaultIfNull(questionLog.getQuestionScore(), questionLog.getStudentScore()));
+            myTotalScore = myTotalScore.add(defaultIfNull(questionLog.getStudentScore(), ZERO));
             idsSet.add(questionLog.getGeneralQuestionLogId().toString());
         }
         // 及格分值比率
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
index e77f6ce9..8be28b85 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
@@ -703,7 +703,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
             sumErrorCount += errorCount;
             sumDoCount += ObjectUtil.isNotEmpty(questionLog.getTeacherOpenCourseQuestionLogAnswer()) ? 1 : 0;
             questionTotalScore = questionTotalScore.add(defaultIfNull(questionLog.getQuestionScore(), questionLog.getStudentScore()));
-            myTotalScore = myTotalScore.add(defaultIfNull(questionLog.getStudentScore(), questionLog.getQuestionScore()));
+            myTotalScore = myTotalScore.add(defaultIfNull(questionLog.getStudentScore(), ZERO));
             idsSet.add(questionLog.getTeacherOpenCourseQuestionLogId().toString());
         }
         // 及格分值比率