From bef0b984a1cdd47844cb21aa4e4d71292a26db93 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Thu, 3 Aug 2023 17:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=9F=A5=E8=AF=A2=E5=87=BA=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9E=E8=AE=AD=E6=8C=89=E7=85=A7=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trading_trading/service/TrainingService.java      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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<String> statusOrder = Arrays.asList("ONGOING", "NOT_STARTED", "FINISHED");
+            trainingList.sort(Comparator.comparingInt(training -> statusOrder.indexOf(training.getStatus())));
             return new PageInfo<>(trainingList);
         }
         return new PageInfo<>();