浏览代码

Merge remote-tracking branch 'origin/master'

Joburgess 4 年之前
父节点
当前提交
401a6943ad
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

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

@@ -3304,7 +3304,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							throw new BizException("老师{}[{}]没有设置默认课酬,请先设置", user.getRealName(), teacherId);
 							throw new BizException("老师{}[{}]没有设置默认课酬,请先设置", user.getRealName(), teacherId);
 						}
 						}
 
 
-						TeacherDefaultMusicGroupSalary tdms = map.get(newCourseSchedule.getType());
+						TeacherDefaultMusicGroupSalary tdms = null;
+						if(newCourseSchedule.getType() == CourseScheduleType.HIGH){
+							tdms = map.get(CourseScheduleType.HIGH_ONLINE);
+						}else{
+							tdms = map.get(newCourseSchedule.getType());
+						}
 						if (tdms == null) {
 						if (tdms == null) {
 							SysUser user = sysUserFeignService.queryUserById(teacherId);
 							SysUser user = sysUserFeignService.queryUserById(teacherId);
 							throw new BizException("老师{}[{}]没有设置默认课酬,请先设置", user.getRealName(), teacherId);
 							throw new BizException("老师{}[{}]没有设置默认课酬,请先设置", user.getRealName(), teacherId);