Merge branch 'dev'

# Conflicts:
#	zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

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

@@ -390,7 +390,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         User user = iUserService.getById(bo.getUserId());
         //校验是否有快进
         SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
-        if (ObjectUtils.isNotNull(tenant) && tenant.getFastForwardSign() == 1 && user.getFastForwardSign() == 1){
+        if (ObjectUtils.isNotNull(tenant) && user.getFastForwardSign() == 1){
             checkFastForward(bo);
         }
         /*GoodsVo goodsVo = iGoodsService.queryById(bo.getGoodsId());
@@ -458,7 +458,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                                         if((fullName.contains("继续教育")&&fullName.contains("施工现场专业人员"))||fullName.equals("继续教育一级建造师")){
                                             if((DateUtils.getNowTime().longValue()-userPeriodStatusVo.getRecordStartTime().longValue())<(videoTime.longValue()-5)){
                                                 log.info("视频学习时长不达标"+JSON.toJSONString(bo));
-                                                if (ObjectUtils.isNotNull(tenant) && tenant.getFastForwardSign() == 1){
+                                                if (ObjectUtils.isNotNull(tenant) && user.getFastForwardSign() == 1){
                                                     throw new CustomException("视频学习时长不达标,"+(videoTime.longValue()-5-(DateUtils.getNowTime().longValue()-userPeriodStatusVo.getRecordStartTime().longValue())),5581);
                                                 }else {
                                                     throw new CustomException("视频学习时长不达标,"+(videoTime.longValue()-5-(DateUtils.getNowTime().longValue()-userPeriodStatusVo.getRecordStartTime().longValue())),558);
@@ -467,7 +467,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                                         }
                                         else{
                                             log.info("视频学习时长不达标"+JSON.toJSONString(bo));
-                                            if (ObjectUtils.isNotNull(tenant) && tenant.getFastForwardSign() == 1){
+                                            if (ObjectUtils.isNotNull(tenant) && user.getFastForwardSign() == 1){
                                                 throw new CustomException("视频学习时长不达标,"+(videoTime.longValue()-5-(DateUtils.getNowTime().longValue()-userPeriodStatusVo.getRecordStartTime().longValue())),5581);
                                             }else {
                                                 throw new CustomException("视频学习时长不达标,"+(videoTime.longValue()-5-(DateUtils.getNowTime().longValue()-photo.getCreateTime().longValue())),558);
@@ -477,7 +477,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                                 }
                                 if(photoList.size()<num){
                                     log.info("拍照次数不达标"+JSON.toJSONString(bo));
-                                    if (ObjectUtils.isNotNull(tenant) && tenant.getFastForwardSign() == 1){
+                                    if (ObjectUtils.isNotNull(tenant) && user.getFastForwardSign() == 1){
                                         throw new CustomException("拍照次数不达标",5591);
                                     }else {
                                         throw new CustomException("拍照次数不达标",559);
@@ -485,7 +485,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                                 }
                             }else{
                                 log.info("拍照次数不达标"+JSON.toJSONString(bo));
-                                if (ObjectUtils.isNotNull(tenant) && tenant.getFastForwardSign() == 1){
+                                if (ObjectUtils.isNotNull(tenant) && user.getFastForwardSign() == 1){
                                     throw new CustomException("拍照次数不达标",5591);
                                 }else {
                                     throw new CustomException("拍照次数不达标",559);