Merge branch 'online1'

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

@@ -4592,6 +4592,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			SysConfig practiceCourseSalaryConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_SALARY);
 			BigDecimal teacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());
 			for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
+				courseScheduleTeacherSalary.setUserId(teacherId);
 				if(teacherSalary.compareTo(courseScheduleTeacherSalary.getExpectSalary())==0){
 					continue;
 				}
@@ -4599,7 +4600,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				if(teacherDefaultPracticeGroupSalaries == null || teacherDefaultPracticeGroupSalaries.size() == 0){
 					throw new BizException("请设置老师默认课酬");
 				}
-				courseScheduleTeacherSalary.setUserId(teacherId);
 				courseScheduleTeacherSalary.setExpectSalary(teacherDefaultPracticeGroupSalaries.get(0).getMainTeacherSalary());
 			}
 			courseScheduleTeacherSalaryDao.batchUpdate(courseScheduleTeacherSalaries);
@@ -4697,6 +4697,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					List<Long> courseIds = groupNotStartCourses.stream().map(CourseSchedule::getId).collect(Collectors.toList());
 					List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedules(courseIds);
 					for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
+						courseScheduleTeacherSalary.setUserId(teacherId);
 						if(teacherSalary.compareTo(courseScheduleTeacherSalary.getExpectSalary())==0){
 							continue;
 						}
@@ -4704,7 +4705,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						if(teacherDefaultPracticeGroupSalaries == null || teacherDefaultPracticeGroupSalaries.size() == 0){
 							throw new BizException("请设置老师默认课酬");
 						}
-						courseScheduleTeacherSalary.setUserId(teacherId);
 						courseScheduleTeacherSalary.setExpectSalary(teacherDefaultPracticeGroupSalaries.get(0).getMainTeacherSalary());
 					}
 					courseScheduleTeacherSalaryDao.batchUpdate(courseScheduleTeacherSalaries);