Browse Source

搜索条件新增

change 3 years ago
parent
commit
c69f9f3f5e

+ 1 - 1
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -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 ++;
                         }
                     }