From 9e66797d4f1771e24f477384fe53ebae65a6ce1a Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Thu, 19 Mar 2026 14:52:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A9=BA=E5=9F=9F=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../convert/AirlineAreaControllerConvert.java |  5 ++++-
 .../airline/service/dto/AirlineAreaDTO.java   |  5 +++++
 .../impl/AirlineAreaGroupServiceImpl.java     | 22 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 2 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 7e37c5d..18e3cac 100644
--- a/src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java
+++ b/src/main/java/com/ruoyi/airline/controller/convert/AirlineAreaControllerConvert.java
@@ -76,7 +76,10 @@ public class AirlineAreaControllerConvert extends BaseConvert<AirlineAreaDTO, Ai
                 log.error("转换坐标点信息失败: {}", e.getMessage());
             }
         }
-        
+
+        // 复制创建者名称
+        vo.setCreateByName(dto.getCreateByName());
+
         return vo;
     }
 
diff --git a/src/main/java/com/ruoyi/airline/service/dto/AirlineAreaDTO.java b/src/main/java/com/ruoyi/airline/service/dto/AirlineAreaDTO.java
index 74bc520..187d4a7 100644
--- a/src/main/java/com/ruoyi/airline/service/dto/AirlineAreaDTO.java
+++ b/src/main/java/com/ruoyi/airline/service/dto/AirlineAreaDTO.java
@@ -81,6 +81,11 @@ public class AirlineAreaDTO extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 创建者名称
+     */
+    private String createByName;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
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 bd8d63f..9e50ed9 100644
--- a/src/main/java/com/ruoyi/airline/service/impl/AirlineAreaGroupServiceImpl.java
+++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineAreaGroupServiceImpl.java
@@ -15,6 +15,8 @@ import com.ruoyi.airline.service.convert.AirlineAreaServiceConvert;
 import com.ruoyi.airline.service.dto.AirlineAreaDTO;
 import com.ruoyi.airline.service.dto.AirlineAreaGroupDTO;
 import com.ruoyi.airline.service.dto.AirlineAreaGroupInfoDTO;
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.system.api.RemoteUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +47,9 @@ public class AirlineAreaGroupServiceImpl implements IAirlineAreaGroupService {
     @Autowired
     private IAirlineAreaTimeRuleService iAirlineAreaTimeRuleService;
 
+    @Autowired
+    private RemoteUserService remoteUserService;
+
     @Override
     public int deletegroupById(Long userId, Long groupId) {
         // 1、删除空域分组明细
@@ -120,7 +125,22 @@ public class AirlineAreaGroupServiceImpl implements IAirlineAreaGroupService {
                 List<com.ruoyi.airline.service.dto.AirlineAreaTimeRuleDTO> timeRules = iAirlineAreaTimeRuleService.selectTimeRuleListByAreaId(areaDTO.getId());
                 areaDTO.setTimeRules(timeRules);
             }
-            
+
+            // 转换createBy为用户名称
+            for (AirlineAreaDTO areaDTO : areaDTOs) {
+                if (areaDTO.getCreateBy() != null && !areaDTO.getCreateBy().isEmpty()) {
+                    try {
+                        Long createByUserId = Long.parseLong(areaDTO.getCreateBy());
+                        com.ruoyi.common.core.domain.R<String> userNameResult = remoteUserService.getUserName(createByUserId, SecurityConstants.INNER);
+                        if (userNameResult != null && userNameResult.getCode() == 200) {
+                            areaDTO.setCreateByName(userNameResult.getData());
+                        }
+                    } catch (NumberFormatException e) {
+                        log.warn("无法解析用户ID: {}", areaDTO.getCreateBy());
+                    }
+                }
+            }
+
             dto.setGroupInfos(areaDTOs);
         }
         return dto;