From ce52499b3e5759b750bb04feade1f8d0f3a37fef Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Fri, 27 Feb 2026 20:08:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../airline/controller/AirlineAreaGroupController.java    | 2 +-
 .../airline/domain/convert/AirlineAreaDomainConvert.java  | 2 +-
 src/main/resources/mapper/airline/AirlineAreaMapper.xml   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineAreaGroupController.java b/src/main/java/com/ruoyi/airline/controller/AirlineAreaGroupController.java
index 243ea5c..a4766c8 100644
--- a/src/main/java/com/ruoyi/airline/controller/AirlineAreaGroupController.java
+++ b/src/main/java/com/ruoyi/airline/controller/AirlineAreaGroupController.java
@@ -190,7 +190,7 @@ public class AirlineAreaGroupController extends BaseController {
      */
     @GetMapping("/areaList")
     @Operation(summary = "根据用户ID查询空域列表")
-    public AjaxResult selectAreaListByUserId(AirlineAreaVO area) {
+    public AjaxResult selectAreaListByUserId(@ModelAttribute AirlineAreaVO area) {
         // 设置用户ID
         area.setCreateBy(SecurityUtils.getUserId().toString());
         // 转换为DTO
diff --git a/src/main/java/com/ruoyi/airline/domain/convert/AirlineAreaDomainConvert.java b/src/main/java/com/ruoyi/airline/domain/convert/AirlineAreaDomainConvert.java
index e11a456..15d2610 100644
--- a/src/main/java/com/ruoyi/airline/domain/convert/AirlineAreaDomainConvert.java
+++ b/src/main/java/com/ruoyi/airline/domain/convert/AirlineAreaDomainConvert.java
@@ -79,7 +79,7 @@ public class AirlineAreaDomainConvert extends BaseConvert<AirlineAreaEntity, Air
         entity.setAreaArea(model.getAreaArea());
         entity.setAreaPerimeter(model.getAreaPerimeter());
         entity.setRadius(model.getRadius());
-        entity.setRemark(entity.getRemark());
+        entity.setRemark(model.getRemark());
         entity.setCreateBy(model.getCreateBy());
         entity.setCreateTime(model.getCreateTime());
         entity.setUpdateBy(model.getUpdateBy());
diff --git a/src/main/resources/mapper/airline/AirlineAreaMapper.xml b/src/main/resources/mapper/airline/AirlineAreaMapper.xml
index 2065834..db47213 100644
--- a/src/main/resources/mapper/airline/AirlineAreaMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineAreaMapper.xml
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from airline_area
         <where>
             <if test="name != null and name != ''">
-                and name like CONCAT('%', #{name}, '%')
+                and name like concat('%', #{name}, '%')
             </if>
             <if test="areaType != null and areaType != ''">
                 and area_type = #{areaType}
@@ -94,13 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join airline_area_group_info aagi on aa.id = aagi.area_id
         left join airline_area_group aag on aagi.group_id = aag.group_id
         <where>
-            and aagi.del_flag = 0
+            aagi.del_flag = 0
             and aag.del_flag = 0
-            <if test="createBy != null">
+            <if test="createBy != null and createBy != ''">
                 and aa.create_by = #{createBy}
             </if>
             <if test="name != null and name != ''">
-                and aa.name like CONCAT('%', #{name}, '%')
+                and aa.name like concat('%', #{name}, '%')
             </if>
             <if test="areaType != null and areaType != ''">
                 and aa.area_type = #{areaType}