From 9bb85bad4968509948209767b51675b1210aa2d3 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 20 May 2024 15:53:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=A6=E6=83=85=E6=89=A7=E8=A1=8C=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E9=87=8D=E5=A4=8D=E5=85=B3=E8=81=94=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=9C=80=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=82=A3=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ExtFunctionalCaseTestMapper.xml       |  2 +-
 .../service/FunctionalTestCaseService.java       | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml
index dba46dab68..e3f402258a 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml
@@ -74,7 +74,7 @@
         <include refid="planFilters">
             <property name="filter" value="request.filter"/>
         </include>
-        group by tpfc.test_plan_id
+        order by tpfc.last_exec_time desc
     </select>
 
     <select id="getPlanExecuteHistoryList" resultType="io.metersphere.functional.dto.TestPlanCaseExecuteHistoryDTO">
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalTestCaseService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalTestCaseService.java
index 5f58446145..f5dc889809 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalTestCaseService.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalTestCaseService.java
@@ -34,10 +34,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author guoyuqi
@@ -254,7 +252,15 @@ public class FunctionalTestCaseService {
      * @return List<FunctionalCaseTestPlanDTO>
      */
     public List<FunctionalCaseTestPlanDTO> hasAssociatePlanPage(AssociatePlanPageRequest request) {
-        return extFunctionalCaseTestMapper.getPlanList(request);
+        List<FunctionalCaseTestPlanDTO> planList = extFunctionalCaseTestMapper.getPlanList(request);
+        List<FunctionalCaseTestPlanDTO> returnList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(planList)) {
+            LinkedHashMap<String, List<FunctionalCaseTestPlanDTO>> caseMap = planList.stream().collect(Collectors.groupingBy(FunctionalCaseTestPlanDTO::getTestPlanId, LinkedHashMap::new, Collectors.toList()));
+            caseMap.forEach((planId,list)->{
+                returnList.add(list.get(0));
+            });
+        }
+        return returnList;
     }
 
     public List<TestPlanCaseExecuteHistoryDTO> getTestPlanCaseExecuteHistory(String caseId) {