|
|
@@ -4416,7 +4416,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
if(!CollectionUtils.isEmpty(dataList)){
|
|
|
Stream<CourseSchedule> stream = dataList.stream();
|
|
|
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())){
|
|
|
stream.filter(e->DateUtil.dateToString(e.getClassDate(),DateUtil.ISO_EXPANDED_DATE_FORMAT).equals(queryInfo.getClassDate()));
|
zouxuan