1、恢复休学时返回默认教师

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -86,6 +86,15 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
                                                        @Param("subjectIds") String subjectIds);
 
     /**
+     * @describe 获取教师
+     * @author Joburgess
+     * @date 2019/12/26
+     * @param teacherId:
+     * @return com.ym.mec.biz.dal.dto.TeacherBasicDto
+     */
+    TeacherBasicDto findByTeacherId(@Param("teacherId")Integer teacherId);
+
+    /**
      * count上课结算列表
      * @param params
      * @return

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -2490,7 +2490,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId.longValue(), null);
 		List<TeacherBasicDto> teacherByOrganAndSubject = teacherDao.findTeacherByOrganAndSubject(vipGroup.getOrganId().toString(), classGroup.getSubjectIdList());
-
+        if(CollectionUtils.isEmpty(teacherByOrganAndSubject)){
+            teacherByOrganAndSubject=new ArrayList<>();
+            teacherByOrganAndSubject.add(teacherDao.findByTeacherId(vipGroup.getUserId()));
+        }
 		return teacherByOrganAndSubject;
 	}
 }

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -301,6 +301,18 @@
             FIND_IN_SET(t.subject_id_, #{subjectIds})
             AND INTE_ARRAY ( CONCAT(t.organ_id_,',',t.flow_organ_range_), #{organIds} )
     </select>
+    <select id="findByTeacherId" resultMap="TeacherBasicDto">
+        SELECT
+            su.id_,
+            su.username_,
+            su.real_name_,
+            t.organ_id_
+        FROM
+            teacher t
+            LEFT JOIN sys_user su ON t.id_ = su.id_
+        WHERE
+            t.id_=#{teacherId}
+    </select>
     <select id="countCloses" resultType="java.lang.Integer">
         SELECT COUNT(cs.id_)
         FROM course_schedule cs