From 19b7aea90201b67c52c8341a18375199fa352055 Mon Sep 17 00:00:00 2001
From: gyb111222 <gyb@example.com>
Date: Fri, 20 Mar 2026 14:59:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=88=AA=E7=82=B9=E4=BF=9D=E5=AD=987000?=
 =?UTF-8?q?=208000?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AirlineAreaGroupServiceImpl.java      | 10 +++++++---
 .../resources/mapper/airline/AirlineAreaMapper.xml     |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/airline/service/impl/AirlineAreaGroupServiceImpl.java b/src/main/java/com/ruoyi/airline/service/impl/AirlineAreaGroupServiceImpl.java
index c5709bc..4485ba6 100644
--- a/src/main/java/com/ruoyi/airline/service/impl/AirlineAreaGroupServiceImpl.java
+++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineAreaGroupServiceImpl.java
@@ -143,13 +143,17 @@ public class AirlineAreaGroupServiceImpl implements IAirlineAreaGroupService {
                 if (areaDTO.getCreateBy() != null && !areaDTO.getCreateBy().isEmpty()) {
                     try {
                         Long createByUserId = Long.parseLong(areaDTO.getCreateBy());
+                        log.info("转换createBy: userId={}, createBy={}", createByUserId, areaDTO.getCreateBy());
                         com.ruoyi.common.core.domain.R<String> userNameResult =
                             remoteUserService.getUserName(createByUserId, SecurityConstants.INNER);
-                        if (userNameResult != null && userNameResult.getCode() == 200) {
+                        log.info("获取用户名称结果: code={}, data={}", userNameResult.getCode(), userNameResult.getData());
+                        if (userNameResult != null && userNameResult.getCode() == 200 && userNameResult.getData() != null) {
                             areaDTO.setCreateByName(userNameResult.getData());
+                        } else {
+                            log.warn("获取用户名称失败: code={}, msg={}", userNameResult.getCode(), userNameResult.getMsg());
                         }
-                    } catch (NumberFormatException e) {
-                        log.warn("无法解析用户ID: {}", areaDTO.getCreateBy());
+                    } catch (Exception e) {
+                        log.error("转换createBy为用户名称异常: {}", e.getMessage());
                     }
                 }
 
diff --git a/src/main/resources/mapper/airline/AirlineAreaMapper.xml b/src/main/resources/mapper/airline/AirlineAreaMapper.xml
index 97d4c90..cd20c76 100644
--- a/src/main/resources/mapper/airline/AirlineAreaMapper.xml
+++ b/src/main/resources/mapper/airline/AirlineAreaMapper.xml
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 根据ID列表查询空域 -->
     <select id="selectAreaListByIds" parameterType="java.util.List" resultMap="AirlineAreaResult">
-        select distinct aa.id, aa.name, aa.area_type, aa.status, aa.points, aa.shape, aa.area_area, aa.area_perimeter, aa.radius, aa.min_height, aa.max_height, aa.create_by, aa.create_time, aa.update_by, aa.update_time, aa.remark
+        select distinct aa.id, aagi.group_id, aa.name, aa.area_type, aa.status, aa.points, aa.shape, aa.area_area, aa.area_perimeter, aa.radius, aa.min_height, aa.max_height, aa.create_by, aa.create_time, aa.update_by, aa.update_time, aa.remark
         from airline_area aa
         inner join airline_area_group_info aagi on aa.id = aagi.area_id
         where aagi.del_flag = 0