From bf2639e4821122e0bf2d8b25b1de74e75bb6cff5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 14:30:01 +0800
Subject: [PATCH] 2026-03-09 标记功能接口调整: 1、目录表增加is_delete字段,用于标记目录是否可以删除;只要true/false; 2、目录数据库中增加“默认文件夹”数据,不可被删除;在删除目录中判断固定id为default_directory_00000001的数据不可删除。

---
 ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java b/ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java
index 89f6592..f32c264 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java
@@ -2,7 +2,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.ard.common.exception.NoPermissionException;
+import com.ard.common.exception.ControlException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.AccessDeniedException;
@@ -24,7 +24,7 @@
 /**
  * 全局异常处理器
  * 
- * @author ruoyi
+ * @author ard
  */
 @RestControllerAdvice
 public class GlobalExceptionHandler
@@ -148,8 +148,8 @@
     /**
      * 无人机无控制权异常
      */
-    @ExceptionHandler(NoPermissionException.class)
-    public AjaxResult handleNoPermissionException(NoPermissionException e)
+    @ExceptionHandler(ControlException.class)
+    public AjaxResult handleNoPermissionException(ControlException e)
     {
         return AjaxResult.error(e.getMessage());
     }

--
Gitblit v1.9.3