|
@@ -655,7 +655,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
for (CalendarStudyVo calendarStudyVo : collect) {
|
|
|
List<DayStudyVo> dayStudyVos = calendarStudyVo.getDayStudyList().stream().filter(CalendarStudyVo -> CalendarStudyVo.getDate().equals(Convert.toLong(now.get(Calendar.DAY_OF_MONTH)))).collect(Collectors.toList());
|
|
|
for (DayStudyVo dayStudyVo : dayStudyVos) {
|
|
|
- if (dayStudyVo.getPerform() != 1){
|
|
|
+ if (dayStudyVo.getPerform() != null && dayStudyVo.getPerform() != 1){
|
|
|
planSum ++;
|
|
|
}
|
|
|
}
|