From fcfb36868a59791fab1f0860acf004f7e877e6cf Mon Sep 17 00:00:00 2001
From: lihongbiao <964708803@qq.com>
Date: Thu, 17 Jul 2025 20:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aircraft/modules/system/controller/EmAreaController.java | 5 ++---
 .../modules/system/controller/EmScenicController.java        | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmAreaController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmAreaController.java
index 21cbdd7..4cfb5a4 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmAreaController.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmAreaController.java
@@ -69,10 +69,9 @@ public class EmAreaController {
             EmArea area = entityService.getById(id);
             List<EmScenic> emScenics = emScenicService.findByAreaId(id);
             if (null != emScenics && !emScenics.isEmpty()) {
-                throw new RuntimeException("机构下面还存在部门，无法删除");
+                throw new RuntimeException("区域下面还存在景区，无法删除");
             }
-            area.setDelFlag(1);
-            entityService.updateById(area);
+            entityService.removeById(area.getId());
             return new ResponseEntity<>(true, HttpStatus.OK);
         } catch (DataIntegrityViolationException e) {
             LOG.error("删除区域失败", e);
diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmScenicController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmScenicController.java
index 43b08ec..c87562b 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmScenicController.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmScenicController.java
@@ -73,8 +73,7 @@ public class EmScenicController {
             if (null != fdBaseUsers && !fdBaseUsers.isEmpty()) {
                 throw new RuntimeException("部门里面还存在用户，无法删除");
             }
-            scenic.setDelFlag(1);
-            entityService.updateById(scenic);
+            entityService.removeById(scenic.getId());
             return new ResponseEntity<>(HttpStatus.OK);
         } catch (DataIntegrityViolationException e) {
             LOG.error("删除景区失败", e);