fix:bug修复

src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java

@@ -49,7 +49,7 @@ public class AirlineMarkerController extends BaseController {
     /**
      * 获取标注详情
      */
-    @GetMapping("/{id}")
+    @GetMapping("/marmerList/{id}")
     @Operation(summary = "获取标注详情")
     public AjaxResult getInfo(@PathVariable Long id) {
         AirlineMarkerDTO dto = iAirlineMarkerService.selectMarkerById(id);

src/main/java/com/ruoyi/airline/domain/api/IAirlineMarkerDomain.java

@@ -21,6 +21,8 @@ public interface IAirlineMarkerDomain {
 
     AirlineMarker selectMarkerById(Long id);
 
+    AirlineMarker selectMarker(AirlineMarker marker);
+
     List<AirlineMarker> selectMarkerListByIds(List<Long> ids);
 
     /**

src/main/java/com/ruoyi/airline/domain/impl/AirlineMarkerDomainImpl.java

@@ -55,6 +55,19 @@ public class AirlineMarkerDomainImpl implements IAirlineMarkerDomain {
         return AirlineMarkerDomainConvert.from(entity);
     }
 
+    @Override
+    public AirlineMarker selectMarker(AirlineMarker marker) {
+        if (marker == null) {
+            return null;
+        }
+        AirlineMarkerEntity entity = AirlineMarkerDomainConvert.to(marker);
+        List<AirlineMarkerEntity> list = airlineMarkerMapper.selectMarkerList(entity);
+        if (list != null && !list.isEmpty()) {
+            return AirlineMarkerDomainConvert.from(list.get(0));
+        }
+        return null;
+    }
+
     @Override
     public List<AirlineMarker> selectMarkerListByIds(List<Long> ids) {
         return AirlineMarkerDomainConvert.fromList(airlineMarkerMapper.selectMarkerListByIds(ids));

src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerServiceImpl.java

@@ -90,14 +90,17 @@ public class AirlineMarkerServiceImpl implements IAirlineMarkerService {
     public List<AirlineMarkerDTO> selectMarkerList(AirlineMarkerDTO dto) {
 
         AirlineMarkerGroupInfoDTO groupInfoDTO = new AirlineMarkerGroupInfoDTO();
-        groupInfoDTO.setMarkerId(dto.getGroupId());
+        groupInfoDTO.setGroupId(dto.getGroupId());
         List<AirlineMarkerGroupInfoDTO> groupInfos = iAirlineMarkerGroupInfoService.selectMarkerGroupInfoList(groupInfoDTO);
 
         List<AirlineMarkerDTO> result = new ArrayList<>();
+        AirlineMarker marker = AirlineMarkerServiceConvert.to(dto);
+
         // 为每个标注设置分组ID
         for (AirlineMarkerGroupInfoDTO markerDto : groupInfos) {
             // 查询分组关系
-            AirlineMarker airlineMarker = iAirlineMarkerDomain.selectMarkerById(markerDto.getMarkerId());
+            marker.setId(markerDto.getId());
+            AirlineMarker airlineMarker = iAirlineMarkerDomain.selectMarker(marker);
             AirlineMarkerDTO airlineMarkerDTO = AirlineMarkerServiceConvert.from(airlineMarker);
             airlineMarkerDTO.setGroupId(groupInfos.get(0).getGroupId());
             result.add(airlineMarkerDTO);