Merge remote-tracking branch 'origin/master'

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

@@ -4103,6 +4103,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				//统计授课次数
 				resultMap.put("teacherGiveLesson",courseScheduleTeacherSalaryDao.countTeacherGiveLesson(coursesGroup.getTeacherId()));
 				break;
+			case MUSIC:
+				MusicGroup musicGroup = musicGroupDao.get(groupId);
+				resultMap.put("groupName",musicGroup.getName());
+				resultMap.put("groupStatus",musicGroup.getStatus().getCode());
+				teacher = teacherDao.get(musicGroup.getEducationalTeacherId());
+				resultMap.put("groupTeacher",teacher.getRealName());
+				resultMap.put("teacherIntroduction",teacher.getIntroduction());
+				resultMap.put("teacherAvatar",teacher.getAvatar());
+				//统计授课次数
+				resultMap.put("teacherGiveLesson",courseScheduleTeacherSalaryDao.countTeacherGiveLesson(musicGroup.getEducationalTeacherId()));
+				break;
 			default:
 				throw new BizException("课程类型错误");
 		}

mec-im/src/main/java/com/ym/pojo/CustomMessage.java

@@ -51,7 +51,7 @@ public class CustomMessage extends BaseMessage {
         return "{\"enable\":" + enable +
                 ", \"customType\":" + customType +
                 ", \"rate\":" + rate +
-                ", \"userId\":" + (StringUtils.isEmpty(userId)?"\"\"":userId) +
+                ", \"userId\":" + (StringUtils.isEmpty(userId)?"\"\"":"\"" + userId + "\"") +
                 '}';
     }
 }