From ffb3dbac36cb02bcead237314388b031ac1993f1 Mon Sep 17 00:00:00 2001
From: lihongbiao <964708803@qq.com>
Date: Thu, 24 Jul 2025 15:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=A6=E7=BB=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/EmEmployeesController.java        | 1 -
 .../modules/system/service/impl/EmEmployeesServiceImpl.java     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java
index d6df1a6..e9366d2 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java
@@ -116,7 +116,6 @@ public class EmEmployeesController {
     @ApiImplicitParam(name = "id", value = "飞行员id", required = true, paramType = "path")
     public ResponseEntity<Object> one(@PathVariable final Integer id) {
         try {
-//            EmEmployees emEmployees = JSON.parseObject(SecurityUtils.getCurrentEmployee(), EmEmployees.class);
             EmEmployeesDetailVo entity = emEmployeesService.findById(id);
             return new ResponseEntity<>(entity,HttpStatus.OK);
         } catch (Exception e) {
diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java
index fd49615..53fba72 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java
@@ -159,7 +159,7 @@ public class EmEmployeesServiceImpl extends ServiceImpl<EmEmployeesMapper, EmEmp
         if (emEmployees.getAreaId()!=null){
             emEmployeesDetailVo.setAreaName(areaService.findById(emEmployees.getAreaId()).getName());
             if (emEmployees.getScenicId() != null) {
-                emEmployeesDetailVo.setScenicName(scenicService.findByAreaIdAndName(emEmployeesDetailVo.getScenicId(), emEmployeesDetailVo.getAreaName()).getName());
+                emEmployeesDetailVo.setScenicName(scenicService.getById(emEmployeesDetailVo.getScenicId()).getName());
             }
         }
         return emEmployeesDetailVo;