合作单位关联乐团主管

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

@@ -54,7 +54,7 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 		CooperationOrgan cooperationOrgan1 = cooperationOrganDao.get(cooperationOrgan.getId());
 		//修改了乐团主管后，修改关联乐团的乐团主管
 		if(!cooperationOrgan.getEducationUserId().equals(cooperationOrgan1.getEducationUserId())){
-			//获取进行中和暂停的乐团列表
+			//获取进行中、暂停、筹备中的乐团列表
 			List<MusicGroup> musicGroups = musicGroupDao.findByCooperationIdAndStatus(cooperationOrgan.getId());
 			if(musicGroups.size() > 0){
 				for (MusicGroup musicGroup : musicGroups) {
@@ -82,16 +82,13 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 			List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
 			if(musicGroupList.size() > 0){
 				for (MusicGroup musicGroup : musicGroupList) {
-					//乐团主管有变更
-					if(!cooperationOrgan.getEducationUserId().equals(musicGroup.getEducationalTeacherId())){
-						//不是导入的乐团
-						if(musicGroup.getId().length() > 10){
-							//是否有预报名的群聊
-							ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroup.getId()));
-							if(imGroup != null){
-								imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),musicGroup.getEducationalTeacherId());
-								imGroupMemberService.join(Long.parseLong(musicGroup.getId()),cooperationOrgan.getEducationUserId(),"乐团主管",false);
-							}
+					//不是导入的乐团
+					if(musicGroup.getId().length() > 10){
+						//是否有预报名的群聊
+						ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroup.getId()));
+						if(imGroup != null){
+							imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),musicGroup.getEducationalTeacherId());
+							imGroupMemberService.join(Long.parseLong(musicGroup.getId()),cooperationOrgan.getEducationUserId(),"乐团主管",false);
 						}
 					}
 				}

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

@@ -2538,7 +2538,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     private void updateTeamTeacher(MusicGroup oldMusicGroup, MusicGroup newMusicGroup) {
         //获取当前乐团所有班级
         List<ClassGroup> classGroups = classGroupDao.findClassGroups(newMusicGroup.getId());
-        if (classGroups != null || classGroups.size() == 0) {
+        if (classGroups == null || classGroups.size() == 0) {
             return;
         }
         Integer teamTeacherId = newMusicGroup.getTeamTeacherId();

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

@@ -746,6 +746,6 @@
         SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationOrganId}
     </select>
     <select id="findByCooperationIdAndStatus" resultMap="MusicGroup">
-        SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationOrganId} AND status_ IN ('PROGRESS','PAUSE')
+        SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationOrganId} AND status_ IN ('PROGRESS','PAUSE','PREPARE')
     </select>
 </mapper>