Merge remote-tracking branch 'origin/master'

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -152,7 +152,7 @@
 				and memo_ = #{memo}
 			</when>
 			<otherwise>
-				and memo_ is null
+				and (memo_ is null or memo_ = '')
 			</otherwise>
 		</choose>
 		order by status_ desc,order_ desc,update_time_ desc
@@ -180,7 +180,7 @@
 				and memo_ = #{memo}
 			</when>
 			<otherwise>
-				and memo_ is null
+				and (memo_ is null or memo_ = '')
 			</otherwise>
 		</choose>
 	</select>

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

@@ -568,7 +568,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	public boolean batchUpdateCourseSchedule(BatchInsertCoursesDto batchInsertCoursesDto) {
 
 		List<CourseSchedule> courseScheduleList = courseScheduleDao.findByCourseScheduleIds(batchInsertCoursesDto.getCourseScheduleIdList());
-		List<Integer> classGroupList = courseScheduleList.stream().distinct().map(CourseSchedule::getClassGroupId).collect(Collectors.toList());
+		List<Integer> classGroupList = courseScheduleList.stream().map(CourseSchedule::getClassGroupId).distinct().collect(Collectors.toList());
 
 		if (classGroupList == null || classGroupList.size() != 1) {
 			throw new BizException("修改失败，只支持同一个班级的课程批量调整");