zouxuan 2 years ago
parent
commit
45963caaf8

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

@@ -4416,7 +4416,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(!CollectionUtils.isEmpty(dataList)){
 		if(!CollectionUtils.isEmpty(dataList)){
 			Stream<CourseSchedule> stream = dataList.stream();
 			Stream<CourseSchedule> stream = dataList.stream();
 			if(StringUtils.isNotEmpty(queryInfo.getSearch())){
 			if(StringUtils.isNotEmpty(queryInfo.getSearch())){
-				stream = stream.filter(e -> e.getId().toString().equals(queryInfo.getSearch()) || e.getName().contains(queryInfo.getSearch()));
+				stream = stream.filter(e -> (e.getId() != null && e.getId().toString().equals(queryInfo.getSearch())) || e.getName().contains(queryInfo.getSearch()));
 			}
 			}
 			if(StringUtils.isNotEmpty(queryInfo.getClassDate())){
 			if(StringUtils.isNotEmpty(queryInfo.getClassDate())){
 				stream.filter(e->DateUtil.dateToString(e.getClassDate(),DateUtil.ISO_EXPANDED_DATE_FORMAT).equals(queryInfo.getClassDate()));
 				stream.filter(e->DateUtil.dateToString(e.getClassDate(),DateUtil.ISO_EXPANDED_DATE_FORMAT).equals(queryInfo.getClassDate()));