From 17a35de70ec84f393a07dcf9cdc7e76bd4a1beed Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 17 Oct 2025 16:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..eb3dab9 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;
@@ -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