diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
index 0b8b8458..28aff58a 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
@@ -159,14 +159,19 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
         List<TeacherOpenCourseMergeCourseInfo> mergeCourseInfoList = teacherOpenCourseMergeCourseInfoDao.getByIds(teacherOpenCourseMergeResourcesQuestion.getTeacherOpenCourseMergeCourseInfoId().toString());
         TeacherOpenCourseMergeCourseInfo courseInfo = CollectionUtils.firstElement(mergeCourseInfoList);
         if(null != courseInfo && courseInfo.getCourseInfoType() == 2) {
-            String courseInfoName = courseInfo.getCourseInfoName();
+
+            //查询章节题目配置信息
             TeacherOpenCourseQuestionSettingQuery questionSettingQuery = new TeacherOpenCourseQuestionSettingQuery();
-            questionSettingQuery.setTeacherOpenCourseQuestionSettingName(courseInfoName);
+            questionSettingQuery.setTeacherOpenCourseQuestionSettingName(courseInfo.getCourseInfoName());
             questionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
             TeacherOpenCourseQuestionSetting questionSetting = teacherOpenCourseQuestionSettingService.getInfo(questionSettingQuery);
-            Long questionSettingId = questionSetting.getTeacherOpenCourseQuestionSettingId();
-            List<ResourcesQuestionSnapshot> snapshotList = resourcesQuestionSnapshotService.getResourcesQuestionSnapshotList(Collections.singletonList(teacherOpenCourseMergeResourcesQuestion), questionSettingId, (o) -> {});
-            resourcesQuestionSnapshotService.insertBatch(snapshotList);
+
+            // 不为空，则添加数据到题目快照表
+            if (null != questionSetting) {
+                Long questionSettingId = questionSetting.getTeacherOpenCourseQuestionSettingId();
+                List<ResourcesQuestionSnapshot> snapshotList = resourcesQuestionSnapshotService.getResourcesQuestionSnapshotList(Collections.singletonList(teacherOpenCourseMergeResourcesQuestion), questionSettingId, (o) -> {});
+                resourcesQuestionSnapshotService.insertBatch(snapshotList);
+            }
         }
         return jsonResult;
     }