diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java
index 5b77ebb4..a1e06b2f 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java
@@ -822,6 +822,17 @@ public class ResourcesQuestionService extends CoreBaseService<ResourcesQuestion>
         return "";
     }
 
+
+    public String formatQuestion(String question) {
+
+        if (StringUtils.isNotBlank(question)&&StringUtils.isNotBlank(question.replace("<p>","").replace("<br>","").replace("</p>","").replace("<br/>","").trim())){
+            return question;
+        }else {
+            return "";
+        }
+
+    }
+
     public String getCellFormatValue(Cell cell) {
         String value = null;
         if (cell != null) {
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
index b42acace..38322a18 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.jlw.util.ToolUtils;
 import cn.jlw.validate.ValidateConfig;
@@ -30,6 +31,7 @@ import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static com.ibeetl.admin.core.util.StreamUtils.listJoin;
@@ -45,39 +47,48 @@ import static com.ibeetl.jlw.enums.OpenCourseMergeJoinTypeEnum.student_join;
 @Transactional
 @Validated
 @Slf4j
-public class TeacherOpenCourseMergeStudentService extends CoreBaseService<TeacherOpenCourseMergeStudent> implements DeleteResourcesBy{
+public class TeacherOpenCourseMergeStudentService extends CoreBaseService<TeacherOpenCourseMergeStudent> implements DeleteResourcesBy {
 
-    @Autowired private UserConsoleService userConsoleService;
-    @Autowired private TeacherOpenCourseMergeStudentDao teacherOpenCourseMergeStudentDao;
-    @Autowired private TeacherOpenCourseMergeTeacherDao teacherOpenCourseMergeTeacherDao;
-    @Autowired private TeacherOpenCourseMergeSchoolClassDao teacherOpenCourseMergeSchoolClassDao;
-    @Autowired private StudentDao studentDao;
-    @Autowired private TeacherDao teacherDao;
+    @Autowired
+    private UserConsoleService userConsoleService;
+    @Autowired
+    private TeacherOpenCourseMergeStudentDao teacherOpenCourseMergeStudentDao;
+    @Autowired
+    private TeacherOpenCourseMergeTeacherDao teacherOpenCourseMergeTeacherDao;
+    @Autowired
+    private TeacherOpenCourseMergeSchoolClassDao teacherOpenCourseMergeSchoolClassDao;
+    @Autowired
+    private StudentDao studentDao;
 
-    public PageQuery<TeacherOpenCourseMergeStudent>queryByCondition(PageQuery query){
-        PageQuery ret =  teacherOpenCourseMergeStudentDao.queryByCondition(query);
+
+    @Autowired
+    private TeacherService teacherService;
+
+
+    public PageQuery<TeacherOpenCourseMergeStudent> queryByCondition(PageQuery query) {
+        PageQuery ret = teacherOpenCourseMergeStudentDao.queryByCondition(query);
         queryListAfter(ret.getList());
         return ret;
     }
 
-    public PageQuery<TeacherOpenCourseMergeStudent>queryByConditionQuery(PageQuery query){
-        PageQuery ret =  teacherOpenCourseMergeStudentDao.queryByConditionQuery(query);
+    public PageQuery<TeacherOpenCourseMergeStudent> queryByConditionQuery(PageQuery query) {
+        PageQuery ret = teacherOpenCourseMergeStudentDao.queryByConditionQuery(query);
         queryListAfter(ret.getList());
         return ret;
     }
 
-    public void deleteByList(List list){
+    public void deleteByList(List list) {
         String ids = "";
         ToolUtils.deleteNullList(list);
-        for(int i=0;null != list && i<list.size();i++){
-            ids += list.get(i).toString()+(i==list.size()-1?"":",");
+        for (int i = 0; null != list && i < list.size(); i++) {
+            ids += list.get(i).toString() + (i == list.size() - 1 ? "" : ",");
         }
-        if(StringUtils.isNotBlank(ids)){
+        if (StringUtils.isNotBlank(ids)) {
             teacherOpenCourseMergeStudentDao.deleteByIds(ids);
         }
     }
 
-    public void deleteTeacherOpenCourseMergeStudent(String ids){
+    public void deleteTeacherOpenCourseMergeStudent(String ids) {
         try {
             teacherOpenCourseMergeStudentDao.deleteTeacherOpenCourseMergeStudentByIds(ids);
         } catch (Exception e) {
@@ -85,7 +96,7 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
         }
     }
 
-    public String addAll(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
+    public String addAll(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery) {
         String msg = "";
         List<TeacherOpenCourseMergeStudent> teacherOpenCourseMergeStudentList = new ArrayList<>();
         try {
@@ -93,10 +104,11 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
         } catch (Exception e) {
             try {
                 teacherOpenCourseMergeStudentList.add(JSONObject.parseObject(teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseMergeStudentJsonStr(), TeacherOpenCourseMergeStudent.class));
-            } catch (Exception e1) {}
+            } catch (Exception e1) {
+            }
         }
 
-        String studentIdsAsString           = listJoin(teacherOpenCourseMergeStudentList, TeacherOpenCourseMergeStudent::getStudentId);
+        String studentIdsAsString = listJoin(teacherOpenCourseMergeStudentList, TeacherOpenCourseMergeStudent::getStudentId);
         String teacherOpenCourseIdsAsString = listJoin(teacherOpenCourseMergeStudentList, TeacherOpenCourseMergeStudent::getTeacherOpenCourseId);
 
         TeacherOpenCourseMergeStudentQuery existsStudentQuery = new TeacherOpenCourseMergeStudentQuery();
@@ -109,8 +121,8 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
         teacherOpenCourseMergeStudentDao.deleteByIds(idsDelAdString);
 
         ToolUtils.deleteNullList(teacherOpenCourseMergeStudentList);
-        if(null != teacherOpenCourseMergeStudentList && teacherOpenCourseMergeStudentList.size()>0){
-            for(int i=0;i<teacherOpenCourseMergeStudentList.size();i++){
+        if (null != teacherOpenCourseMergeStudentList && teacherOpenCourseMergeStudentList.size() > 0) {
+            for (int i = 0; i < teacherOpenCourseMergeStudentList.size(); i++) {
                 TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentList.get(i);
                 teacherOpenCourseMergeStudent.setOrgId(teacherOpenCourseMergeStudentQuery.getOrgId());
                 teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentAddTime(new Date());
@@ -129,7 +141,7 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
      * @param teacherOpenCourseMergeStudentQuery
      * @return
      */
-    public JsonResult add(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
+    public JsonResult add(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery) {
         String msg = "";
         TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentQuery.pojo();
 
@@ -153,59 +165,59 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
         return jsonResult;
     }
 
-    public String edit(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
+    public String edit(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery) {
         String msg = "";
         TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentQuery.pojo();
         teacherOpenCourseMergeStudentDao.updateTemplateById(teacherOpenCourseMergeStudent);
         return msg;
     }
 
-    public String updateGivenByIds(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
+    public String updateGivenByIds(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery) {
         String msg = "";
-        if(StringUtils.isNotBlank(teacherOpenCourseMergeStudentQuery.get_given())){
+        if (StringUtils.isNotBlank(teacherOpenCourseMergeStudentQuery.get_given())) {
             boolean flag = teacherOpenCourseMergeStudentDao.updateGivenByIds(teacherOpenCourseMergeStudentQuery) > 0;
-            if(!flag){
+            if (!flag) {
                 msg = "更新指定参数失败";
             }
-        }else{
+        } else {
             msg = "指定参数为空";
         }
         return msg;
     }
 
-    public List<TeacherOpenCourseMergeStudent> getValues (Object paras){
+    public List<TeacherOpenCourseMergeStudent> getValues(Object paras) {
         return sqlManager.select(SqlId.of("jlw.teacherOpenCourseMergeStudent.getTeacherOpenCourseMergeStudentValues"), TeacherOpenCourseMergeStudent.class, paras);
     }
 
-    public List<TeacherOpenCourseMergeStudent> getValuesByQuery (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
+    public List<TeacherOpenCourseMergeStudent> getValuesByQuery(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery) {
         List<TeacherOpenCourseMergeStudent> valuesByQuery = teacherOpenCourseMergeStudentDao.getValuesByQuery(teacherOpenCourseMergeStudentQuery);
         queryListAfter(valuesByQuery);
         return valuesByQuery;
     }
 
-    public List<TeacherOpenCourseMergeStudent> getValuesByQueryNotWithPermission (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
+    public List<TeacherOpenCourseMergeStudent> getValuesByQueryNotWithPermission(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery) {
         List<TeacherOpenCourseMergeStudent> valuesByQueryNotWithPermission = teacherOpenCourseMergeStudentDao.getValuesByQueryNotWithPermission(teacherOpenCourseMergeStudentQuery);
         queryListAfter(valuesByQueryNotWithPermission);
         return valuesByQueryNotWithPermission;
     }
 
-    public TeacherOpenCourseMergeStudent getInfo (Long teacherOpenCourseSchoolClassMergeStudentId){
+    public TeacherOpenCourseMergeStudent getInfo(Long teacherOpenCourseSchoolClassMergeStudentId) {
         TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery = new TeacherOpenCourseMergeStudentQuery();
         teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentId(teacherOpenCourseSchoolClassMergeStudentId);
         teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatusPlural("1,2");//需要根据实际情况来
         List<TeacherOpenCourseMergeStudent> list = teacherOpenCourseMergeStudentDao.getValuesByQuery(teacherOpenCourseMergeStudentQuery);
-        if(null != list && list.size()>0){
+        if (null != list && list.size() > 0) {
             return list.get(0);
-        }else{
+        } else {
             return null;
         }
     }
 
-    public TeacherOpenCourseMergeStudent getInfo (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
+    public TeacherOpenCourseMergeStudent getInfo(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery) {
         List<TeacherOpenCourseMergeStudent> list = teacherOpenCourseMergeStudentDao.getValuesByQuery(teacherOpenCourseMergeStudentQuery);
-        if(null != list && list.size()>0){
+        if (null != list && list.size() > 0) {
             return list.get(0);
-        }else{
+        } else {
             return null;
         }
     }
@@ -215,7 +227,7 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
      *
      * @param teacherOpenCourseMergeStudentQuery
      * @param student
-     * @param teacherOpenCourseMergeTeacherAuthCode     在该字段插入的时候，已经确保唯一
+     * @param teacherOpenCourseMergeTeacherAuthCode 在该字段插入的时候，已经确保唯一
      * @return
      */
     public JsonResult joinCourse(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery,
@@ -237,13 +249,33 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
                 .andEq(TeacherOpenCourseMergeSchoolClass::getSchoolClassId, student.getClassId())
                 .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1)
                 .select();
-
-        Assert.notEmpty(mergeSchoolClassList, "您所在的班级未分配课程！");
+        Long teacherId = teacherOpenCourseMergeTeacher.getTeacherId();
+        Teacher teacher = teacherService.queryById(teacherId);
+        if (teacher == null) {
+            throw new PlatformException("教师不存在");
+        }
+        if (!Objects.equals(teacher.getOrgId(),student.getOrgId())) {
+            return JsonResult.failMessage("该开课课程不属于本学校");
+        }
+        // 如果为空，则表示班级没有关联，给他关联上
+        if (CollectionUtil.isEmpty(mergeSchoolClassList)) {
+            //还是用老师的orgId和userid
+            TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass = new TeacherOpenCourseMergeSchoolClass();
+            teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseMergeSchoolClassAddTime(new Date());
+            teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseMergeSchoolClassStatus(1);
+            teacherOpenCourseMergeSchoolClass.setOrgId(teacher.getOrgId());
+            teacherOpenCourseMergeSchoolClass.setOrgId(teacher.getId());
+            teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseId(teacherOpenCourseId);
+            teacherOpenCourseMergeSchoolClass.setSchoolClassId(student.getClassId());
+            teacherOpenCourseMergeSchoolClassDao.insert(teacherOpenCourseMergeSchoolClass);
+        }
 
         teacherOpenCourseMergeStudentQuery.setUserId(student.getUserId());
         teacherOpenCourseMergeStudentQuery.setOrgId(student.getOrgId());
         teacherOpenCourseMergeStudentQuery.setStudentId(student.getStudentId());
         teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+
+        teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentJoinType(OpenCourseMergeJoinTypeEnum.code_join);
         // 为空则给默认值
         teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(
                 defaultIfNull(teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseSchoolClassMergeStudentStatus(), 1));
@@ -269,14 +301,14 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
     /**
      * 重置用户密码，该老师只能重置他这个专业下的学生的密码
      *
-     * @param studentId     学生ID
+     * @param studentId 学生ID
      */
     public void resetPassword(@NotNull(message = "学生ID不能为空！") Long studentId) {
         Student student = studentDao.getById(studentId);
         Assert.notNull(student.getUserId(), "学生信息异常，请联系管理员！");
 
         CoreUser user = getUser();
-        Teacher teacher = teacherDao.getByUserId(user.getId());
+        Teacher teacher = teacherService.getByUserId(user.getId());
 
         //查询这个老师下面，所有的学生
         List<Long> studentIdList = teacherOpenCourseMergeStudentDao.selectStudentIdListByTeacherId(teacher.getTeacherId());
diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
index 6fac3cf1..4102362b 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
@@ -294,11 +294,21 @@ public class ResourcesQuestionController{
             BigDecimal questionScore = resourcesQuestion.getQuestionScore();
             String questionStem = resourcesQuestion.getQuestionStem();
 
-            String questionOptionA = resourcesQuestion.getQuestionOptionA();
-            String questionOptionB = resourcesQuestion.getQuestionOptionB();
-            String questionOptionC = resourcesQuestion.getQuestionOptionC();
-            String questionOptionD = resourcesQuestion.getQuestionOptionD();
-            String questionOptionE = resourcesQuestion.getQuestionOptionE();
+            String questionOptionA = resourcesQuestionService.formatQuestion(resourcesQuestion.getQuestionOptionA());
+            resourcesQuestion.setQuestionOptionA(questionOptionA);
+
+            String questionOptionB =  resourcesQuestionService.formatQuestion(resourcesQuestion.getQuestionOptionB());
+            resourcesQuestion.setQuestionOptionB(questionOptionB);
+
+            String questionOptionC =  resourcesQuestionService.formatQuestion(resourcesQuestion.getQuestionOptionC());
+            resourcesQuestion.setQuestionOptionC(questionOptionC);
+
+            String questionOptionD =  resourcesQuestionService.formatQuestion(resourcesQuestion.getQuestionOptionD());
+            resourcesQuestion.setQuestionOptionD(questionOptionD);
+
+            String questionOptionE =  resourcesQuestionService.formatQuestion(resourcesQuestion.getQuestionOptionE());
+            resourcesQuestion.setQuestionOptionE(questionOptionE);
+
 
             String questionAnswer = resourcesQuestion.getQuestionAnswer();
             questionAnswer = resourcesQuestionService.answerFormat(questionType,questionAnswer);//格式化