Merge remote-tracking branch 'origin/master'

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

@@ -699,7 +699,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							}else {
 								BigDecimal salary = teacherPracticeSalaryMap.get(cgtm.getUserId());
 								if (salary == null) {
-									throw new BizException("请设置老师陪练课课酬");
+									throw new BizException("请设置老师网管课课酬");
 								}
 								courseScheduleTeacherSalary.setExpectSalary(salary);
 							}

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

@@ -1148,6 +1148,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 throw new BizException("请指定教师类型");
             }
             List<TeacherDefaultMusicGroupSalary> teacherSalaryList = teacherSalaryMap.get(courseScheduleTeacherSalary.getUserId());
+            if(teacherSalaryList == null || teacherSalaryList.size() == 0){
+            	throw new BizException("请设置老师课酬");
+            }
 
             BigDecimal salary;