|
@@ -1486,12 +1486,14 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
|
|
|
* @return
|
|
|
*/
|
|
|
public List<DateChangeVo> splicingDate(String day, List<DateVo> strDateList, List<DateChangeVo> rList) {
|
|
|
- for (DateVo vo : strDateList) {
|
|
|
- if (vo != null) {
|
|
|
- DateChangeVo dateChange = new DateChangeVo();
|
|
|
- dateChange.setStartTime(DateUtil.strToDate(day + " " + vo.getStartTime()));
|
|
|
- dateChange.setEndTime(DateUtil.strToDate(day + " " + vo.getEndTime()));
|
|
|
- rList.add(dateChange);
|
|
|
+ if (CollectionUtils.isNotEmpty(strDateList)){
|
|
|
+ for (DateVo vo : strDateList) {
|
|
|
+ if (vo != null) {
|
|
|
+ DateChangeVo dateChange = new DateChangeVo();
|
|
|
+ dateChange.setStartTime(DateUtil.strToDate(day + " " + vo.getStartTime()));
|
|
|
+ dateChange.setEndTime(DateUtil.strToDate(day + " " + vo.getEndTime()));
|
|
|
+ rList.add(dateChange);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return rList;
|