暂存

web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesQuestion.md

@@ -791,7 +791,13 @@ getRandomMergeResourcesQuestionListByChapterTestQuestion
       AND b.teacher_open_course_id = #teacherOpenCourseId#
       @}
       @if(!isEmpty(questionSettingId)){
-      AND b.teacher_open_course_question_setting_id = #questionSettingId#
+      AND b.teacher_open_course_id 
+            @// 保证至少会返回一个值，默认返回-1
+         = (select ifnull(max(teacher_open_course_id), '-1') from teacher_open_course_question_setting 
+            where  1 
+            and teacher_open_course_question_setting_id = #questionSettingId# 
+            and teacher_open_course_question_setting_status = 1 
+            limit 1)
       @}
       @// 如果都为空，则不返回数据，比较保守些
       @if(isEmpty(questionSettingId) && isEmpty(teacherOpenCourseId)){