diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java b/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java
index 257dc2f..a0d76b0 100644
--- a/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java
+++ b/src/main/java/com/ruoyi/airline/controller/AirlineMarkerController.java
@@ -25,7 +25,7 @@ import java.util.List;
  * @author 拓恒
  */
 @RestController
-@RequestMapping("/markerGroup")
+@RequestMapping("/marker")
 @Tag(name = "标注管理")
 public class AirlineMarkerController extends BaseController {
 
diff --git a/src/main/resources/mapper/airline/AirlineMarkerMapper.xml b/src/main/resources/mapper/airline/AirlineMarkerMapper.xml
index 3bcb912..e095734 100644
--- a/src/main/resources/mapper/airline/AirlineMarkerMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineMarkerMapper.xml
@@ -120,10 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select distinct am.id, am.marker_name, am.marker_type, am.status, am.color, am.icon, am.font_size, am.coordinates, am.description, am.create_by, am.create_time, am.update_by, am.update_time, am.remark
         from airline_marker am
         left join airline_marker_group_info amgi on am.id = amgi.marker_id
-        left join airline_area_group aag on amgi.group_id = aag.group_id
+        left join airline_marker_group amg on amgi.group_id = amg.group_id
         <where>
             amgi.del_flag = 0
-            and aag.del_flag = 0
+            and (amg.del_flag = 0 or amg.del_flag is null)
             <if test="createBy != null and createBy != ''">
                 and am.create_by = #{createBy}
             </if>
@@ -144,10 +144,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select distinct am.id, am.marker_name, am.marker_type, am.status, am.color, am.icon, am.font_size, am.coordinates, am.description, am.create_by, am.create_time, am.update_by, am.update_time, am.remark
         from airline_marker am
         inner join airline_marker_group_info amgi on am.id = amgi.marker_id
+        left join airline_marker_group amg on amgi.group_id = amg.group_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}
             </if>