Merge branch 'master' into dev

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -101,7 +101,7 @@ public class CommonController extends BaseController {
         map.put("hide",false);
         if(Validator.isNotEmpty(bo.getVersion())){
             if(bo.getVersion().equals("5.2.4")){
-                map.put("hide",true);
+                map.put("hide",false);
             }
         }
         return AjaxResult.success(map);

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1037,7 +1037,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 }
                 UserStudyRecordQueryBo queryBo = BeanUtil.toBean(entity, UserStudyRecordQueryBo.class);
                 UserStudyRecordVo recordVo = iUserStudyRecordService.queryLast(queryBo);
-                if(Validator.isEmpty(recordVo)||(recordVo.getStatus()!=1&&Validator.isNotEmpty(recordVo))){
+                if(Validator.isEmpty(recordVo)||(Validator.isEmpty(recordVo.getStatus()))||recordVo.getStatus()!=1){
                     UserStudyRecord add = BeanUtil.toBean(entity, UserStudyRecord.class);
                     add.setCreateTime(DateUtils.getNowTime());
                     add.setUpdateTime(DateUtils.getNowTime());