Merge branch 'feature/0427-school' into master_saas

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

@@ -170,4 +170,6 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
     List<ClassGroupTeacherMapper> findAllByMusicGroupIds(@Param("musicGroupIds") List<String> musicGroupIds);
 
     List<ClassGroupTeacherMapper> getByMusicGroupId(@Param("musicGroupId") String musicGroupId);
+
+    int count(@Param("ids") List<String> ids, @Param("teacherId") long teacherId);
 }

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

@@ -161,6 +161,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private MusicGroupSchoolTermCourseDetailDao musicGroupSchoolTermCourseDetailDao;
 
+    @Autowired
+    private CooperationOrganService cooperationOrganService;
+
+    @Autowired
+    private ClassGroupTeacherMapperDao classGroupTeacherMapperDao;
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
         return classGroupDao;
@@ -343,8 +348,20 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if (musicGroup != null && musicGroup.getCooperationOrganId() != null) {
 
+            // 查询合作单位的所有老师
+            List<MusicGroup> musicGroups = cooperationOrganService.musicGroupPage(musicGroup.getCooperationOrganId());
+            List<String> ids = musicGroups.stream().map(o -> o.getId()).collect(Collectors.toList());
+
             List<ImGroupMemberWrapper.ImGroupMember > imGroupMemberList = new ArrayList<>();
             for (ClassGroupTeacherMapper classGroupTeacherMapper : teacherMapperList) {
+
+                if (!CollectionUtils.isEmpty(ids)) {
+                    int count = classGroupTeacherMapperDao.count(ids, classGroupTeacherMapper.getUserId().longValue());
+                    if(count > 1) {
+                        continue;
+                    }
+                }
+
                 ImGroupMemberWrapper.ImGroupMember build = ImGroupMemberWrapper.ImGroupMember.builder()
                         .userId(classGroupTeacherMapper.getUserId().longValue())
                         .roleType(EFriendRoleType.ORCHESTRA_TEACHER.getMsg())

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

@@ -260,4 +260,12 @@
     <select id="getByMusicGroupId" resultMap="ClassGroupTeacherMapper">
         SELECT * FROM class_group_teacher_mapper WHERE music_group_id_=#{musicGroupId}
     </select>
+
+    <select id="count" resultType="int">
+        select count(1) from class_group_teacher_mapper where class_group_id_ in
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        and user_id_ = #{teacherId}
+    </select>
 </mapper>