修改乐团基本信息不修改乐团主管

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

@@ -2537,7 +2537,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             return;
         }
         Integer teamTeacherId = newMusicGroup.getTeamTeacherId();
-//        Integer educationalTeacherId = newMusicGroup.getEducationalTeacherId();
+        Integer educationalTeacherId = newMusicGroup.getEducationalTeacherId();
 
         Integer oldDirectorUserId = oldMusicGroup.getDirectorUserId();
         if (oldDirectorUserId == null) {
@@ -2550,12 +2550,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         List<Integer> quitUserIdList = new ArrayList<Integer>();
         quitUserIdList.add(oldMusicGroup.getTeamTeacherId());
-//        quitUserIdList.add(oldMusicGroup.getEducationalTeacherId());
+        quitUserIdList.add(oldMusicGroup.getEducationalTeacherId());
         quitUserIdList.add(oldDirectorUserId);
 
         Map<Integer, String> userRoleMap = new HashMap<Integer, String>();
         userRoleMap.put(directorUserId, "乐队指导");
-//        userRoleMap.put(educationalTeacherId, "乐团主管");
+        userRoleMap.put(educationalTeacherId, "乐团主管");
         userRoleMap.put(teamTeacherId, "运营主管");
 
         classGroups.forEach(e -> {
@@ -2583,12 +2583,16 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
-        musicGroup.setEducationalTeacherId(null);
         musicGroup.setStatus(group.getStatus());
         if (!group.getSchoolId().equals(musicGroup.getSchoolId())) {
             //如果已生成课表，那么修改未上课时教学点
             courseScheduleDao.updateCourseScheduleSchool("MUSIC", musicGroupId, musicGroup.getSchoolId());
         }
+        CooperationOrgan cooperationOrgan = cooperationOrganDao.get(musicGroup.getCooperationOrganId());
+        if(cooperationOrgan.getEducationUserId() == null){
+            throw new BizException("操作失败：请先配置合作单位: {} 关联的乐团主管",cooperationOrgan.getName());
+        }
+        musicGroup.setEducationalTeacherId(cooperationOrgan.getEducationUserId());
         if (group.getStatus() == MusicGroupStatusEnum.PROGRESS) {
             updateTeamTeacher(group, musicGroup);
         }