From 1be9f626a04691fff5532a6ae37e2ff26def5edb Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Thu, 12 Mar 2026 16:59:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E8=B0=83=E6=95=B4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AirlineMarkerServiceImpl.java        | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerServiceImpl.java b/src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerServiceImpl.java
index 91e95b2..a57bb07 100644
--- a/src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerServiceImpl.java
+++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerServiceImpl.java
@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.security.utils.SecurityUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -87,22 +88,22 @@ public class AirlineMarkerServiceImpl implements IAirlineMarkerService {
 
     @Override
     public List<AirlineMarkerDTO> selectMarkerList(AirlineMarkerDTO dto) {
-        AirlineMarker model = AirlineMarkerServiceConvert.to(dto);
-        List<AirlineMarker> markers = iAirlineMarkerDomain.selectMarkerList(model);
-        List<AirlineMarkerDTO> dtos = AirlineMarkerServiceConvert.fromList(markers);
-        
+
+        AirlineMarkerGroupInfoDTO groupInfoDTO = new AirlineMarkerGroupInfoDTO();
+        groupInfoDTO.setMarkerId(dto.getGroupId());
+        List<AirlineMarkerGroupInfoDTO> groupInfos = iAirlineMarkerGroupInfoService.selectMarkerGroupInfoList(groupInfoDTO);
+
+        List<AirlineMarkerDTO> result = new ArrayList<>();
         // 为每个标注设置分组ID
-        for (AirlineMarkerDTO markerDto : dtos) {
+        for (AirlineMarkerGroupInfoDTO markerDto : groupInfos) {
             // 查询分组关系
-            AirlineMarkerGroupInfoDTO groupInfoDTO = new AirlineMarkerGroupInfoDTO();
-            groupInfoDTO.setMarkerId(markerDto.getId());
-            List<AirlineMarkerGroupInfoDTO> groupInfos = iAirlineMarkerGroupInfoService.selectMarkerGroupInfoList(groupInfoDTO);
-            if (!groupInfos.isEmpty()) {
-                markerDto.setGroupId(groupInfos.get(0).getGroupId());
-            }
+            AirlineMarker airlineMarker = iAirlineMarkerDomain.selectMarkerById(markerDto.getMarkerId());
+            AirlineMarkerDTO airlineMarkerDTO = AirlineMarkerServiceConvert.from(airlineMarker);
+            airlineMarkerDTO.setGroupId(groupInfos.get(0).getGroupId());
+            result.add(airlineMarkerDTO);
         }
         
-        return dtos;
+        return result;
     }
 
     @Override