tanzh 3 년 전
부모
커밋
22b5902713
1개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 5 2
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

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

@@ -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())) {