Merge remote-tracking branch 'origin/transaction_teacher' into transaction_teacher

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

@@ -3139,9 +3139,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
 
         Map<Integer, String> userRoleMap = new HashMap<Integer, String>();
-        userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
-        userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
-        userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
+        if(musicGroup.getEducationalTeacherId() != null){
+            userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
+        }
+        if(musicGroup.getTeamTeacherId() != null){
+            userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
+        }
+        if(musicGroup.getDirectorUserId() != null){
+            userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
+        }
+        if(musicGroup.getTransactionTeacherId() != null){
+            userRoleMap.put(musicGroup.getTransactionTeacherId(), "衔接老师");
+        }
         for (Integer userId : userIds) {
             if (userId == null) continue;
 

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

@@ -1172,6 +1172,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroup.getDirectorUserId() != null) {
             userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
         }
+        if (musicGroup.getTransactionTeacherId() != null) {
+            userRoleMap.put(musicGroup.getTransactionTeacherId(), "衔接老师");
+        }
         // 添加成员
         imGroupMemberService.join(Long.parseLong(musicGroupId), userRoleMap);
         Set<Integer> roleIds = new HashSet<>(1);