1、恢复休学时返回默认教师

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

@@ -373,7 +373,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			subjectNameCourseMap = MapUtil.convertMybatisMap(subjectNameCourseMaps);
 		}
 		List<Map<Integer, Integer>> studentNumCourseMaps=null;
-		if(CollectionUtils.isEmpty(courseScheduleIds)){
+		if(!CollectionUtils.isEmpty(courseScheduleIds)){
 			studentNumCourseMaps = studentAttendanceDao.countStudentAttendancesByCourses(courseScheduleIds);
 		}
 		Map<Integer, Integer> studentNumCourseMap=new HashMap<>();

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

@@ -1458,6 +1458,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.isNull(studentPauseInfo)){
 			throw new BizException("未找到休学信息");
 		}
+
+		if(Objects.nonNull(studentRecoverInfo.getTeacherId())){
+			vipGroup.setUserId(studentRecoverInfo.getTeacherId());
+		}
+
 		Map<String, Object> courseInfo = JSON.parseObject(studentPauseInfo.getCoursesJson(), Map.class);
 		List<BigDecimal> coursePrices = (List<BigDecimal>) courseInfo.get("coursePriceInfo");
 		coursePrices.sort(Comparator.naturalOrder());
@@ -1485,6 +1490,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 			TeacherDefaultVipGroupSalary teacherDefaultVipGroupSalary = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(vipGroup.getUserId(), vipGroup.getVipGroupCategoryId());
 
+			if(Objects.isNull(teacherDefaultVipGroupSalary)){
+				throw new BizException("请设置默认课酬");
+			}
+
 			//创建老师单节课课酬信息
 			courseScheduleTeacherSalaryService.createCourseScheduleTeacherVipSalary(vipGroup,
 					newCourseSchedules,