From 128447d263b3f5cac53cf10d0decc2b2172c5f0d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 02 Aug 2021 11:56:21 +0800
Subject: [PATCH] 代码同步
---
src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
index a3ae2de..6097ab7 100644
--- a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
@@ -22,9 +22,13 @@
@Override
public IPage<TrainingRegistrationVo> selectTrainingRegistrationPage(IPage<TrainingRegistrationVo> page, TrainingRegistrationVo trainingRegistration) {
List<TrainingRegistrationVo> trainingRegistrationVos = baseMapper.selectTrainingRegistrationPage(page, trainingRegistration);
- trainingRegistrationVos.forEach(trainingRegistrationVo -> {
- trainingRegistrationVo.setRemainingTime(LongTimeUtil.getDistanceTime(trainingRegistrationVo.getTrainExamTime().getTime(), System.currentTimeMillis()));
- });
+ if (trainingRegistrationVos.size()>0) {
+ trainingRegistrationVos.forEach(trainingRegistrationVo -> {
+ if (null!=trainingRegistrationVo.getTrainExamTime()) {
+ trainingRegistrationVo.setRemainingTime(LongTimeUtil.getDistanceTime(trainingRegistrationVo.getTrainExamTime().getTime(), System.currentTimeMillis()));
+ }
+ });
+ }
return page.setRecords(trainingRegistrationVos);
}
--
Gitblit v1.9.3