From 9ab9d33a9e2d13dcb21f2fd06a42ebcbad009e5c Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 30 Nov 2022 22:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=BA=9B=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ibeetl/jlw/service/GeneralQuestionLogService.java  | 2 +-
 .../com/ibeetl/jlw/service/GeneralQuestionSettingService.java   | 2 +-
 .../ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java | 2 +-
 .../jlw/service/TeacherOpenCourseQuestionSettingService.java    | 2 +-
 4 files changed, 4 insertions(+), 4 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 e12f1097..4a83a124 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
@@ -640,7 +640,7 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
         if(!isReSend) {
             GeneralQuestionLogQuery questionLogQuery = new GeneralQuestionLogQuery();
             questionLogQuery.setStudentId(studentId);
-            // 正在做题的话，再次进来如果这个试卷没提交，则继续做题，不会传生成新的题目
+            // 正在做题的话，再次进来如果这个试卷没提交，则继续做题，不会重新生成题目
             questionLogQuery.setQuestionLogAddType(PRE_SUBMIT);
             questionLogQuery.setGeneralQuestionSettingId(setting.getGeneralQuestionSettingId());
             questionLogQuery.setGeneralQuestionLogStatus(1);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
index 5f7af4ed..c36dc63c 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
@@ -523,7 +523,7 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
         }
 
         // 学生身份屏蔽答案，且记录在做题日志表中，这里不为空的判断有点多余
-        if (student != null) {
+        {
             // 判断章节练习是否需要重发试卷的题目
             boolean selectIsReSend = generalQuestionLogService.
                     verifyLogAddTypeIsReSend(generalQuestionSettingId, studentId, fromTypeEnum, FINALLY_SUBMIT);
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 a9b1cb4a..eb56181e 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
@@ -452,7 +452,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
         if(!isReSend) {
             TeacherOpenCourseQuestionLogQuery questionLogQuery = new TeacherOpenCourseQuestionLogQuery();
             questionLogQuery.setStudentId(studentId);
-            // 正在做题的话，再次进来如果这个试卷没提交，则继续做题，不会传生成新的题目
+            // 正在做题的话，再次进来如果这个试卷没提交，则继续做题，不会重新生成题目
             questionLogQuery.setQuestionLogAddType(PRE_SUBMIT);
             questionLogQuery.setTeacherOpenCourseQuestionSettingId(setting.getTeacherOpenCourseQuestionSettingId());
             questionLogQuery.setTeacherOpenCourseQuestionLogStatus(1);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
index 7cdb1c53..2e60e313 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
@@ -739,7 +739,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
         }
 
         // 学生身份屏蔽答案，且记录在做题日志表中，这里不为空的判断有点多余
-        if (student != null) {
+        {
             // 判断章节练习是否需要重发试卷的题目
             boolean selectIsReSend = teacherOpenCourseQuestionLogService.
                     verifyLogAddTypeIsReSend(teacherOpenCourseQuestionSettingId, studentId, fromTypeEnum, FINALLY_SUBMIT);