|
@@ -61,7 +61,7 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
|
|
|
Date nextMonday = Date.from(sunDayDate.plusDays(1).atStartOfDay(DateUtil.zoneId).toInstant());
|
|
|
|
|
|
- List<StudentServeDto> serviceStudents = studentDao.getBeServiceStudents(monDayDate.toString(), !sunDayDate.isAfter(LocalDate.now())?new Date():nextMonday);
|
|
|
+ List<StudentServeDto> serviceStudents = studentDao.getBeServiceStudents(monDayDate.toString(), sunDayDate.isBefore(LocalDate.now())?nextMonday:new Date());
|
|
|
if(CollectionUtils.isEmpty(serviceStudents)){
|
|
|
return;
|
|
|
}
|