update

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

@@ -115,7 +115,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<Map<String, String>> findVipStuNames(String vipIds);
 
     /**
-     * 获取课程下的学员列表
+     * 获取班级下的学员列表
      *
      * @param classGroupId
      * @return
@@ -378,4 +378,11 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return java.util.List<java.lang.String>
      */
     List<String> findClassGroupNamesByClassGroups(@Param("classGroups") List<Integer> classGroups);
+
+    /**
+     * 获取当前班级相关的老师列表
+     * @param groupId
+     * @return
+     */
+    List<ImUserModel> findGroupTeacher(Integer groupId);
 }

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

@@ -518,7 +518,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public List<ImUserModel> findGroupUsers(Integer groupId) {
-        return classGroupDao.findGroupUsers(groupId);
+        List<ImUserModel> students = classGroupDao.findGroupUsers(groupId);
+        if(students == null){
+            students = new ArrayList<>();
+        }
+        List<ImUserModel> teachers = classGroupDao.findGroupTeacher(groupId);
+        students.addAll(teachers);
+        return students;
     }
 
     @Override

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

@@ -266,6 +266,11 @@
         LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
         WHERE cgsm.class_group_id_ = #{classGroupId} GROUP BY su.id_
     </select>
+    <select id="findGroupTeacher" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.ImUserModel">
+        SELECT su.id_,su.avatar_,su.username_ FROM class_group_teacher_mapper cgtm
+        LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_
+        WHERE cgtm.class_group_id_ = #{classGroupId} GROUP BY su.id_
+    </select>
     <select id="countStudentPayLog" resultType="java.lang.Integer">
         SELECT COUNT(spo.id_)
         FROM student_payment_order spo

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -96,7 +96,7 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.queryTeacherGroups(sysUser.getId(),search));
     }
 
-    @ApiOperation(value = "获取和当前教师通讯录列表")
+    @ApiOperation(value = "获取当前教师通讯录列表")
     @GetMapping("/queryGroupStudents")
     public Object queryGroupStudents(String search){
         SysUser sysUser = sysUserFeignService.queryUserInfo();