From 2c94f9520e2372a4f1e5591da09778d553f13def Mon Sep 17 00:00:00 2001
From: yangdj <18302547071@163>
Date: Fri, 25 Nov 2022 23:56:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=AA=E6=9F=A5=20=201,2?=
 =?UTF-8?q?=20=E4=B8=8A=E6=9E=B6=E5=92=8C=E4=B8=8B=E6=9E=B6=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/TeacherOpenCourseMergeResourcesQuestionController.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java
index c8e57a18..e76734c0 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java
@@ -70,6 +70,9 @@ public class TeacherOpenCourseMergeResourcesQuestionController{
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
+            if(condition.getQuestionStatus() == null){
+                condition.setQuestionStatusPlural("1,2");
+            }
             PageQuery page = condition.getPageQuery();
             teacherOpenCourseMergeResourcesQuestionService.queryByConditionQuery(page);
             return JsonResult.success(page);