提交：BUG处理

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

@@ -195,8 +195,8 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         if (Validator.isNotEmpty(bo.getHandStatus()) && bo.getHandStatus() != 0) {
             update.setFirstHandTime(DateUtils.getNowTime());
         }
-        if(Validator.isNotEmpty(update.getApplyId())){
-            MockApply mockApply = iMockApplyService.getById(update.getApplyId());
+        if(Validator.isNotEmpty(userMockSubscribeVo.getApplyId())){
+            MockApply mockApply = iMockApplyService.getById(userMockSubscribeVo.getApplyId());
             if (Validator.isNotEmpty(mockApply) && mockApply.getMockActivity() == 1){
                 //活动模考
                 update.setUpdateTime(DateUtils.getNowTime());
@@ -263,6 +263,8 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                             if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteEndTime())) {
                                 userMockSubscribeVos.add(userMockSubscribeVo);
                             }
+                        }else if (ObjectUtils.isNotNull(userMockSubscribeVo.getActivityEndTime()) && System.currentTimeMillis()/1000 < userMockSubscribeVo.getActivityEndTime()){
+                            userMockSubscribeVos.add(userMockSubscribeVo);
                         }else {
                             userMockSubscribeVos.add(userMockSubscribeVo);
                         }