From 417d17f99cb317bdc6d33f01585255aaf37c7fac Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 21 Nov 2024 11:26:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml | 4 +++-
 .../io/metersphere/dashboard/service/DashboardService.java    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
index 29b655fe5e..9765b718ae 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
@@ -813,7 +813,9 @@
         FROM api_definition
         WHERE api_definition.deleted = false
         AND api_definition.project_id =  #{projectId}
-        AND api_definition.update_time BETWEEN #{startTime} AND #{endTime} order by api_definition.update_time desc
+        AND api_definition.update_time BETWEEN #{startTime} AND #{endTime}
+        AND api_definition.update_time > api_definition.create_time
+        order by api_definition.update_time desc
     </select>
 
     <select id="scenarioRefApiCount" resultType="io.metersphere.api.dto.definition.ApiRefSourceCountDTO">
diff --git a/backend/services/dashboard/src/main/java/io/metersphere/dashboard/service/DashboardService.java b/backend/services/dashboard/src/main/java/io/metersphere/dashboard/service/DashboardService.java
index 2aafe2ce79..a56911e186 100644
--- a/backend/services/dashboard/src/main/java/io/metersphere/dashboard/service/DashboardService.java
+++ b/backend/services/dashboard/src/main/java/io/metersphere/dashboard/service/DashboardService.java
@@ -1389,7 +1389,7 @@ public class DashboardService {
         List<NameCountDTO> nameCountDTOS = buildBugRetentionRateList(totalSize, statusSize);
         Map<String, List<NameCountDTO>> statusStatisticsMap = new HashMap<>();
         statusStatisticsMap.put("retentionRate", nameCountDTOS);
-        Map<String, List<SelectOption>> bugMap = legacyBugList.stream().collect(Collectors.groupingBy(SelectOption::getValue));
+        Map<String, List<SelectOption>> bugMap = legacyBugList.stream().collect(Collectors.groupingBy(SelectOption::getText));
         List<StatusPercentDTO> statusPercentList = new ArrayList<>();
         for (SelectOption selectOption : headerStatusOption) {
             StatusPercentDTO statusPercentDTO = new StatusPercentDTO();