update

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

@@ -5406,15 +5406,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		CourseSchedule courseSchedule;
 		if(schedule.getGroupType() == MUSIC){
 			//获取当前班级
-			courseScheduleRateDtos = courseScheduleDao.findCourseRate(null,schedule.getGroupType().getCode(),schedule.getClassGroupId(), TenantContextHolder.getTenantId());
+			courseScheduleRateDtos = courseScheduleDao.findCourseRate(null,schedule.getGroupType().getCode(),schedule.getClassGroupId(), user.getTenantId());
 			//获取最近一次已结束的课程
 			courseSchedule = courseScheduleDao.getLastEndCourse(null,schedule.getGroupType().getCode(),schedule.getClassGroupId());
 		}else {
 			//获取课程列表
-			courseScheduleRateDtos = courseScheduleDao.findCourseRate(schedule.getMusicGroupId(),schedule.getGroupType().getCode(),null, TenantContextHolder.getTenantId());
+			courseScheduleRateDtos = courseScheduleDao.findCourseRate(schedule.getMusicGroupId(),schedule.getGroupType().getCode(),null, user.getTenantId());
 			//获取最近一次已结束的课程
 			courseSchedule = courseScheduleDao.getLastEndCourse(schedule.getMusicGroupId(),schedule.getGroupType().getCode(),null);
 		}
+		if(courseScheduleRateDtos == null || courseScheduleRateDtos.size() == 0){
+			return courseScheduleRateDtos;
+		}
 		List<Long> courseScheduleIds = courseScheduleRateDtos.stream().map(CourseScheduleRateDto::getCourseScheduleId).collect(Collectors.toList());
 		List<CourseScheduleReview> courseReviews = courseScheduleReviewDao.findByCourseSchedules(courseScheduleIds);
 		Map<Integer, List<CourseScheduleReview>> reviews = courseReviews.stream().collect(Collectors.groupingBy(CourseScheduleReview::getCourseScheduleId));

mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesMapper.xml

@@ -128,7 +128,7 @@
 		<where>
 			tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
-				teacher_id_=#{teacherId}
+				and teacher_id_=#{teacherId}
 			</if>
 			<if test="createTime!=null">
 				AND DATE_FORMAT(create_time_, '%Y-%m') = DATE_FORMAT(#{createTime}, '%Y-%m')