zouxuan 5 лет назад
Родитель
Сommit
00d9d482d4

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -48,6 +48,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Autowired
     private TeacherDao teacherDao;
     @Autowired
+    private StudentDao studentDao;
+    @Autowired
     private IdGeneratorService idGeneratorService;
     @Autowired
     private SchoolDao schoolDao;
@@ -1114,6 +1116,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         teacherIds.addAll(teacherDao.findVipEducationalTeacherId(studentId));
         //获取对外课程务老师
         teacherIds.addAll(teacherDao.findCommEducationalTeacherId(studentId));
+        //获取关联的指导老师
+        Student student = studentDao.get(studentId);
+        if(student != null && student.getTeacherId() != null){
+            teacherIds.add(student.getTeacherId());
+        }
         if(teacherIds.size() > 0){
         	return teacherDao.queryTeacherBaseInfo(teacherIds,search);
         }

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

@@ -983,6 +983,8 @@
         SELECT cssp.user_id_ FROM practice_group pg
         LEFT JOIN course_schedule_student_payment cssp ON pg.id_ = cssp.music_group_id_
         WHERE pg.educational_teacher_id_ = #{teacherId} AND cssp.group_type_ = 'PRACTICE'
+        UNION ALL
+        SELECT s.user_id_ FROM student s WHERE s.teacher_id_ = #{teacherId}
     </select>
     <select id="queryCourseClassTeacherIds" resultType="java.lang.Integer">
         SELECT csts.user_id_ FROM music_group mg