|
@@ -237,7 +237,10 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
|
|
|
List<UserMockSubscribeVo> userMockSubscribeVoList = baseMapper.listSubscribe(bo);
|
|
|
List<UserMockSubscribeVo> userMockSubscribeVos = new ArrayList<>();
|
|
|
if (userMockSubscribeVoList != null && userMockSubscribeVoList.size() > 0) {
|
|
|
- if (bo.getMockStatus() == 0) {
|
|
|
+ if (Validator.isEmpty(bo.getMockStatus())) {
|
|
|
+ return userMockSubscribeVoList;
|
|
|
+ }
|
|
|
+ if (Validator.isNotEmpty(bo.getMockStatus()) && bo.getMockStatus() == 0) {
|
|
|
userMockSubscribeVoList.stream().forEach(userMockSubscribeVo -> {
|
|
|
try {
|
|
|
if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteStartTime())) {
|
|
@@ -248,7 +251,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- if (bo.getMockStatus() == 1) {
|
|
|
+ if (Validator.isNotEmpty(bo.getMockStatus()) && bo.getMockStatus() == 1) {
|
|
|
userMockSubscribeVoList.stream().forEach(userMockSubscribeVo -> {
|
|
|
try {
|
|
|
if (System.currentTimeMillis()/1000 > formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteEndTime())) {
|