Merge remote-tracking branch 'origin/saas' into saas

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

audio-analysis/pom.xml

@@ -61,6 +61,40 @@
 		<dependency>
 			<groupId>com.ym</groupId>
 			<artifactId>mec-biz</artifactId>
+			<exclusions>
+				<!-- <exclusion>
+            		<groupId>org.redisson</groupId>
+            		<artifactId>redisson-spring-boot-starter</artifactId>
+				</exclusion> -->
+				<exclusion>
+					<artifactId>netty-common</artifactId>
+					<groupId>io.netty</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>netty-transport</artifactId>
+					<groupId>io.netty</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>netty-resolver</artifactId>
+					<groupId>io.netty</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>netty-buffer</artifactId>
+					<groupId>io.netty</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>netty-resolver-dns</artifactId>
+					<groupId>io.netty</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>netty-handler</artifactId>
+					<groupId>io.netty</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>netty-codec</artifactId>
+					<groupId>io.netty</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -130,6 +130,7 @@ public class NewsController extends BaseController {
 		}
 		if (user == null || user.getId() == null) {
 			queryInfo.setOrganId(43);
+			queryInfo.setTenantId(1);
 			queryInfo.setExcludeIds(excludeIds);
 		} else {
 			queryInfo.setOrganId(user.getOrganId());

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));