diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingService.java b/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingService.java index e955638..edf7371 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingService.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingService.java @@ -18,10 +18,7 @@ import org.springframework.util.StringUtils; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; @Service public class TrainingService { @@ -125,8 +122,12 @@ public class TrainingService { for (Member member : members) { String trainingId = member.getTrainingId(); Training training = trainingMapper.selectByPrimaryKey(trainingId); - trainingList.add(training); + if (training != null) { + trainingList.add(training); + } } + List statusOrder = Arrays.asList("ONGOING", "NOT_STARTED", "FINISHED"); + trainingList.sort(Comparator.comparingInt(training -> statusOrder.indexOf(training.getStatus()))); return new PageInfo<>(trainingList); } return new PageInfo<>();