From c0c95ed1f8d273f18607d0203eac320425b87cd2 Mon Sep 17 00:00:00 2001
From: lhx <liy200110@163.com>
Date: Wed, 10 Dec 2025 17:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3=EF=BC=8Cex?=
 =?UTF-8?q?cel=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 12 +++++++---
 .../common/aop/CheckPermission.java           |  2 --
 .../dc_project/config/SaTokenConfigure.java   | 12 ++++++++--
 .../service/impl/PersonnelServiceImpl.java    | 23 ++++++++++---------
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4444dd4..9cfbb35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,15 @@
             <artifactId>minio</artifactId>
             <version>8.6.0</version>
         </dependency>
+
+
+        <!--excel处理-->
+        <dependency>
+            <groupId>cn.idev.excel</groupId>
+            <artifactId>fastexcel</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -162,17 +171,14 @@
             </testResource>
         </testResources>
         <plugins>
-            <!-- maven打包插件 -> 将整个工程打成一个 fatjar -->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <!-- 作用:项目打成jar，同时把本地jar包也引入进去 -->
                 <configuration>
                     <includeSystemScope>true</includeSystemScope>
                     <mainClass>com.dc.dc_project.DcProjectApplication</mainClass>
                 </configuration>
             </plugin>
-            <!--添加配置跳过测试-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
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<PersonnelMapper, Personnel
 
         Personnel personnel = this.getOneByUserId(userId);
         Long pOrgId = orgMapper.getOrgIdByPersonnelId(personnel.getId());
+        if (pOrgId == null) {
+            return ResponseResult.error("无归属组织，无");
+        }
         List<Long> orgIds = null;
         if (dataScopeType != null) {
             orgIds = switch (dataScopeType) {
@@ -88,13 +91,6 @@ public class PersonnelServiceImpl extends ServiceImpl<PersonnelMapper, Personnel
         personnel.setStatus(1);
         personnel.setCreatedBy(userId);
 
-        if(personnelDto.getOrgId() != null){
-            PersonnelOrg personnelOrg = new PersonnelOrg();
-            personnelOrg.setPersonnelId(personnel.getId());
-            personnelOrg.setOrgId(personnelDto.getOrgId());
-            personnelOrg.setCreatedBy(userId);
-            personnelOrgService.save(personnelOrg);
-        }
         if(personnelDto.getIsUser() == 1){
             User user = new User();
             user.setUsername(personnel.getName());
@@ -103,13 +99,18 @@ public class PersonnelServiceImpl extends ServiceImpl<PersonnelMapper, Personnel
             user.setPhone(personnel.getContactPhone());
             user.setStatus(1);
             user.setRemark(personnel.getRemark());
-            userMapper.insert( user);
+            userMapper.insert(user);
             personnel.setUserId(user.getId());
         }
-        if (this.save(personnel)){
-            return ResponseResult.success();
+        this.save(personnel);
+        if(personnelDto.getOrgId() != null){
+            PersonnelOrg personnelOrg = new PersonnelOrg();
+            personnelOrg.setPersonnelId(personnel.getId());
+            personnelOrg.setOrgId(personnelDto.getOrgId());
+            personnelOrg.setCreatedBy(userId);
+            personnelOrgService.save(personnelOrg);
         }
-        return ResponseResult.error();
+        return ResponseResult.success();
     }
 
     @Override