merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -664,9 +664,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Override
     public SectionStudyRecordVo getUserWatchLast(UserStudyRecordQueryBo bo) {
         SectionStudyRecordVo vo = this.baseMapper.getUserWatchLast(bo);
-        Integer learning = courseChapterSectionMapper.learningCheck(vo.getSectionId(), vo.getGradeId(), bo.getUserId(), vo.getModuleId(), vo.getChapterId(), 0L,vo.getCourseId());
-        if (learning > 0) {
-            vo.setLearning(1L);
+        if(Validator.isNotEmpty(vo)){
+            Integer learning = courseChapterSectionMapper.learningCheck(vo.getSectionId(), vo.getGradeId(), bo.getUserId(), vo.getModuleId(), vo.getChapterId(), 0L,vo.getCourseId());
+            if (learning > 0) {
+                vo.setLearning(1L);
+            }
         }
         return vo;
     }