diff --git a/pom.xml b/pom.xml
index 4444dd4..9cfbb35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,15 @@
minio
8.6.0
+
+
+
+
+ cn.idev.excel
+ fastexcel
+ 1.3.0
+
+
@@ -162,17 +171,14 @@
-
org.springframework.boot
spring-boot-maven-plugin
-
true
com.dc.dc_project.DcProjectApplication
-
org.apache.maven.plugins
maven-surefire-plugin
diff --git a/src/main/java/com/dc/dc_project/common/aop/CheckPermission.java b/src/main/java/com/dc/dc_project/common/aop/CheckPermission.java
index d29b81f..1ebed8a 100644
--- a/src/main/java/com/dc/dc_project/common/aop/CheckPermission.java
+++ b/src/main/java/com/dc/dc_project/common/aop/CheckPermission.java
@@ -1,8 +1,6 @@
package com.dc.dc_project.common.aop;
-import cn.dev33.satoken.SaManager;
import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface;
-import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.exception.SaTokenException;
import cn.dev33.satoken.stp.StpUtil;
import com.dc.dc_project.utils.PermissionUtils;
diff --git a/src/main/java/com/dc/dc_project/config/SaTokenConfigure.java b/src/main/java/com/dc/dc_project/config/SaTokenConfigure.java
index 4a6d3ff..42183b0 100644
--- a/src/main/java/com/dc/dc_project/config/SaTokenConfigure.java
+++ b/src/main/java/com/dc/dc_project/config/SaTokenConfigure.java
@@ -1,20 +1,28 @@
package com.dc.dc_project.config;
-import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.interceptor.SaInterceptor;
import cn.dev33.satoken.router.SaRouter;
+import cn.dev33.satoken.strategy.SaAnnotationStrategy;
import cn.dev33.satoken.stp.StpUtil;
+import com.dc.dc_project.common.aop.CheckPermission;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import jakarta.annotation.PostConstruct;
+
@Configuration
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
public class SaTokenConfigure implements WebMvcConfigurer {
+ @PostConstruct
+ public void registerAnnotationHandler() {
+ // 注册自定义权限注解处理器
+ SaAnnotationStrategy.instance.registerAnnotationHandler(new CheckPermission());
+ }
+
@Override
public void addInterceptors(InterceptorRegistry registry) {
System.out.println("----- SaToken 拦截器启动成功!");
diff --git a/src/main/java/com/dc/dc_project/service/impl/PersonnelServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/PersonnelServiceImpl.java
index aed6af3..f317d62 100644
--- a/src/main/java/com/dc/dc_project/service/impl/PersonnelServiceImpl.java
+++ b/src/main/java/com/dc/dc_project/service/impl/PersonnelServiceImpl.java
@@ -60,6 +60,9 @@ public class PersonnelServiceImpl extends ServiceImpl orgIds = null;
if (dataScopeType != null) {
orgIds = switch (dataScopeType) {
@@ -88,13 +91,6 @@ public class PersonnelServiceImpl extends ServiceImpl