diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
index ef09cfe7..955f0371 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
@@ -51,16 +51,17 @@ public class TeacherOpenCourseQuestionSettingController{
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
+            if (coreUser.isStudent()) {
+                condition.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
+                condition.setTeacherOpenCourseQuestionSettingStatus(1);
+            }
+
             PageQuery page = condition.getPageQuery();
             teacherOpenCourseQuestionSettingService.queryByConditionQuery(page);
             if (!condition.getNotSelectOther()) {
                 // 设置分数和完成时间
                 teacherOpenCourseQuestionSettingService.setMyQuestionLogScoreInfo(page.getList(), getStudent());
             }
-            if (coreUser.isStudent()) {
-                condition.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
-                condition.setTeacherOpenCourseQuestionSettingStatus(1);
-            }
             return JsonResult.success(page);
         }
     }