Merge branch 'master' into dev

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

@@ -100,8 +100,8 @@ public class CommonController extends BaseController {
         Map<String,Object> map = new HashMap<>();
         map.put("hide",false);
         if(Validator.isNotEmpty(bo.getVersion())){
-            if(bo.getVersion().equals("5.2.2")){
-                map.put("hide",false);
+            if(bo.getVersion().equals("5.2.4")){
+                map.put("hide",true);
             }
         }
         return AjaxResult.success(map);

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

@@ -1034,6 +1034,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     iUserPeriodStatusService.save(userPeriodStatusAddBo);
                     periodId = userPeriodStatusAddBo.getId();
 
+                }
+                UserStudyRecordQueryBo queryBo = BeanUtil.toBean(entity, UserStudyRecordQueryBo.class);
+                UserStudyRecordVo recordVo = iUserStudyRecordService.queryLast(queryBo);
+                if(recordVo.getStatus()!=1){
                     UserStudyRecord add = BeanUtil.toBean(entity, UserStudyRecord.class);
                     add.setCreateTime(DateUtils.getNowTime());
                     add.setUpdateTime(DateUtils.getNowTime());
@@ -1042,7 +1046,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     iUserStudyRecordService.save(add);
                     iUserStudyRecordService.studyFinish(add);
                 }
-
+                
             }
         }