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

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

@@ -280,9 +280,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         } else {
             MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
             Map<Integer, String> userRoleMap = new HashMap<>();
-            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(), "衔接老师");
+            }
             if (teacherIdList != null && teacherIdList.size() > 0) {
                 for (Integer teacherId : teacherIdList) {
                     userRoleMap.put(teacherId, "指导老师");
@@ -1015,6 +1024,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         e.setTitle("乐团主管");
                     } else if (musicGroup.getDirectorUserId() != null && Integer.parseInt(e.getId()) == musicGroup.getDirectorUserId()) {
                         e.setTitle("乐队指导");
+                    } else if (musicGroup.getTransactionTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getTransactionTeacherId()) {
+                        e.setTitle("衔接老师");
                     } else if (courseScheduleTeacherSalaryDao.isTeacher(groupId, Integer.parseInt(e.getId()))) {
                         e.setTitle("指导老师");
                     }

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

@@ -92,18 +92,31 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 		if(classGroup.getGroupType() == GroupType.MUSIC){
 			MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
 			tags = musicGroup.getName();
-			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(), "衔接老师");
+			}
 		}else if(classGroup.getGroupType() == GroupType.PRACTICE){
 			PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
 			tags = practiceGroup.getName();
 			userRoleMap.put(practiceGroup.getUserId(), "指导老师");
-			userRoleMap.put(practiceGroup.getEducationalTeacherId(), "乐团主管");
+			if(practiceGroup.getEducationalTeacherId() != null){
+				userRoleMap.put(practiceGroup.getEducationalTeacherId(), "乐团主管");
+			}
 		}else if(classGroup.getGroupType() == GroupType.VIP){
 			VipGroup vipGroup = vipGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
 			userRoleMap.put(vipGroup.getUserId(), "指导老师");
-			userRoleMap.put(vipGroup.getEducationalTeacherId(), "乐团主管");
+			if(vipGroup.getEducationalTeacherId() != null){
+				userRoleMap.put(vipGroup.getEducationalTeacherId(), "乐团主管");
+			}
 			tags = vipGroup.getName();
 		}
 		ImGroup imGroup = imGroupService.create(imGroupId, null, classGroup.getName(), tags, tags, tags, null, classGroup.getGroupType().getCode());