From 10fed354f81aca10fc4b90ea9a74edbd60506666 Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Wed, 18 Mar 2026 15:26:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E7=A9=BA=E5=9F=9F?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=85=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AirlineMarkerController.java       |  4 ++--
 .../convert/AirlineAreaControllerConvert.java     | 15 ++-------------
 .../mapper/airline/AirlineMarkerMapper.xml        |  2 --
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java b/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java
index a0d76b0..565ded5 100644
--- a/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java
+++ b/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java
@@ -96,7 +96,7 @@ public class AirlineMarkerController extends BaseController {
     /**
      * 获取用户下所有可用标注
      */
-    @GetMapping("/user-available")
+    @PostMapping("/user-available")
     @Operation(summary = "获取用户下所有可用标注")
     public AjaxResult getUserAvailableMarkers(AirlineMarkerVO vo) {
         AirlineMarkerDTO dto = AirlineMarkerControllerConvert.to(vo);
@@ -109,7 +109,7 @@ public class AirlineMarkerController extends BaseController {
     /**
      * 获取全部可用标注
      */
-    @GetMapping("/all-available")
+    @PostMapping("/all-available")
     @Operation(summary = "获取全部可用标注")
     public AjaxResult getAllAvailableMarkers(AirlineMarkerVO vo) {
         AirlineMarkerDTO dto = AirlineMarkerControllerConvert.to(vo);
diff --git a/src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java b/src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java
index d1d5779..14ead06 100644
--- a/src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java
+++ b/src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java
@@ -56,19 +56,8 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
         if (dto == null) {
             return null;
         }
-        AirlineAreaVO vo = new AirlineAreaVO();
-        vo.setId(dto.getId());
-        vo.setName(dto.getName());
-        vo.setAreaType(dto.getAreaType());
-        vo.setStatus(dto.getStatus());
-        vo.setShape(dto.getShape());
-        vo.setAreaArea(dto.getAreaArea());
-        vo.setAreaPerimeter(dto.getAreaPerimeter());
-        vo.setRadius(dto.getRadius());
-        vo.setMinHeight(dto.getMinHeight());
-        vo.setMaxHeight(dto.getMaxHeight());
-        vo.setRemark(dto.getRemark());
-
+        AirlineAreaVO vo = super.innerFrom(dto);
+        
         // 转换时间规则列表
         if (dto.getTimeRules() != null && !dto.getTimeRules().isEmpty()) {
             List<AirlineAreaTimeRuleVO> timeRuleVOs = AirlineAreaTimeRuleControllerConvert.fromList(dto.getTimeRules());
diff --git a/src/main/resources/mapper/airline/AirlineMarkerMapper.xml b/src/main/resources/mapper/airline/AirlineMarkerMapper.xml
index 2a925a5..21d5b3b 100644
--- a/src/main/resources/mapper/airline/AirlineMarkerMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineMarkerMapper.xml
@@ -150,8 +150,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join airline_marker_group amg on amgi.group_id = amg.id
         <where>
             amgi.del_flag = 0
-            and amgi.deleted_by is null
-            and amgi.deleted_time is null
             and (amg.del_flag = 0 or amg.del_flag is null)
             <if test="createBy != null and createBy != ''">
                 and am.create_by = #{createBy}