wangliang 1 år sedan
förälder
incheckning
4c779b6558

+ 1 - 1
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamController.java

@@ -231,7 +231,7 @@ public class TEExamController {
             if (!CollectionUtils.isEmpty(teExamActivityList)) {
                 teExam.setEnable(Objects.isNull(teExam.getEnable()) ? 1 : teExam.getEnable());
                 for (TEExamActivity t : teExamActivityList) {
-                    if (Objects.nonNull(t) && Objects.nonNull(t.getEnable()) && t.getEnable().intValue() == 1 && teExam.getEnable().intValue() == 1 && (Objects.nonNull(teExam.getEndTime()) && teExam.getEndTime().longValue() > System.currentTimeMillis())) {
+                    if (Objects.nonNull(t) && Objects.nonNull(t.getEnable()) && t.getEnable().intValue() == 1 && Objects.nonNull(teExam.getEnable()) && teExam.getEnable().intValue() == 1 && (Objects.nonNull(teExam.getEndTime()) && teExam.getEndTime().longValue() > System.currentTimeMillis())) {
                         themisCacheService.updateCurrentExamListCache(t.getExamId().toString(), t.getId());
                         themisCacheService.updateOrgExamListCache(teExam.getOrgId().toString(), t.getExamId().toString(), t.getId());
                     } else {

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamActivityServiceImpl.java

@@ -417,7 +417,7 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                 teExamActivityService.updateExamActivityCacheBean(ac.getId());
                 //加入更新考试列表缓存方法
                 ExamActivityCacheBean examActivityCacheBean = this.getExamActivityCacheBean(ac.getId());
-                if (Objects.nonNull(examActivityCacheBean.getEnable()) && examActivityCacheBean.getEnable().intValue() == 1 && teExam.getEnable().intValue() == 1 && Objects.nonNull(teExam.getEndTime()) && teExam.getEndTime().longValue() > System.currentTimeMillis()) {
+                if (Objects.nonNull(examActivityCacheBean.getEnable()) && examActivityCacheBean.getEnable().intValue() == 1 && Objects.nonNull(teExam.getEnable()) && teExam.getEnable().intValue() == 1 && Objects.nonNull(teExam.getEndTime()) && teExam.getEndTime().longValue() > System.currentTimeMillis()) {
                     themisCacheService.updateCurrentExamListCache(ac.getExamId().toString(), ac.getId());
                     themisCacheService.updateOrgExamListCache(teExam.getOrgId().toString(), ac.getExamId().toString(), ac.getId());
                 } else {