From 4491b34704f058f80beed73af76c072485398963 Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Fri, 27 Feb 2026 16:00:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=88=AA=E7=BA=BF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/convert/AirlineAreaControllerConvert.java     | 5 ++++-
 src/main/resources/db/migration/V2__Create_area_tables.sql   | 1 -
 src/main/resources/mapper/airline/AirlineAreaMapper.xml      | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

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 b2862cd..65a6123 100644
--- a/src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java
+++ b/src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java
@@ -89,7 +89,7 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
         dto.setId(vo.getId());
         dto.setName(vo.getName());
         dto.setAreaType(vo.getAreaType());
-        dto.setStatus(vo.getStatus());
+        dto.setStatus(vo.getStatus() != null ? vo.getStatus() : 1); // Default to enabled
         dto.setShape(vo.getShape());
         dto.setAreaArea(vo.getAreaArea());
         dto.setAreaPerimeter(vo.getAreaPerimeter());
@@ -103,7 +103,10 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
                 dto.setPoints(pointsJson);
             } catch (JsonProcessingException e) {
                 log.error("转换坐标点信息失败: {}", e.getMessage());
+                dto.setPoints("[]"); // Default to empty array
             }
+        } else {
+            dto.setPoints("[]"); // Default to empty array
         }
         
         return dto;
diff --git a/src/main/resources/db/migration/V2__Create_area_tables.sql b/src/main/resources/db/migration/V2__Create_area_tables.sql
index 09c810c..2136e1a 100644
--- a/src/main/resources/db/migration/V2__Create_area_tables.sql
+++ b/src/main/resources/db/migration/V2__Create_area_tables.sql
@@ -21,7 +21,6 @@ CREATE TABLE IF NOT EXISTS airline_area (
 CREATE TABLE IF NOT EXISTS airline_area_group (
     group_id BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
     group_name VARCHAR(255) NOT NULL COMMENT '分组名称',
-    user_id BIGINT(20) NOT NULL COMMENT '用户ID，分组自带用户归属。后期权限都是基于用户ID进行',
     del_flag BIGINT(20) DEFAULT 0 COMMENT '删除标识，0.未删除（默认）；1，已删除',
     deleted_by VARCHAR(64) DEFAULT '' COMMENT '删除者',
     deleted_time DATETIME COMMENT '删除时间',
diff --git a/src/main/resources/mapper/airline/AirlineAreaMapper.xml b/src/main/resources/mapper/airline/AirlineAreaMapper.xml
index e7c188c..93b2911 100644
--- a/src/main/resources/mapper/airline/AirlineAreaMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineAreaMapper.xml
@@ -94,7 +94,6 @@ 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>
-            aa.status != 0
             and aagi.del_flag = 0
             and aag.del_flag = 0
             <if test="createBy != null">