Merge branch 'master' into dev

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

@@ -1033,14 +1033,16 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     userPeriodStatusAddBo.setUpdateTime(DateUtils.getNowTime());
                     iUserPeriodStatusService.save(userPeriodStatusAddBo);
                     periodId = userPeriodStatusAddBo.getId();
+
+                    UserStudyRecord add = BeanUtil.toBean(entity, UserStudyRecord.class);
+                    add.setCreateTime(DateUtils.getNowTime());
+                    add.setUpdateTime(DateUtils.getNowTime());
+                    add.setCurrentStatus(1);
+                    add.setStatus(1);
+                    iUserStudyRecordService.save(add);
+                    iUserStudyRecordService.studyFinish(add);
                 }
-                UserStudyRecord add = BeanUtil.toBean(entity, UserStudyRecord.class);
-                add.setCreateTime(DateUtils.getNowTime());
-                add.setUpdateTime(DateUtils.getNowTime());
-                add.setCurrentStatus(1);
-                add.setStatus(1);
-                iUserStudyRecordService.save(add);
-                iUserStudyRecordService.studyFinish(add);
+
             }
         }