From 78a06c8c9f7377ae99dfb7a62d32824a93e57dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 9 Apr 2026 17:12:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/system/listener/DeptExcelConverter.java    | 2 +-
 .../java/org/dromara/system/listener/DeptExcelOptions.java | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelConverter.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelConverter.java
index 81893a3a7..e8b864dc9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelConverter.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelConverter.java
@@ -55,7 +55,7 @@ public class DeptExcelConverter implements Converter<Long> {
     /**
      * 构建部门路径 → 树节点映射，供 Converter 和 Options 共用
      */
-    static Map<String, Tree<Long>> buildDeptPathMap(ISysDeptService deptService) {
+    private Map<String, Tree<Long>> buildDeptPathMap(ISysDeptService deptService) {
         return TreeBuildUtils.buildTreeNodeMap(
             deptService.selectDeptTreeList(new SysDeptBo()),
             "/",
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelOptions.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelOptions.java
index 50391d6e9..644185d77 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelOptions.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelOptions.java
@@ -1,10 +1,14 @@
 package org.dromara.system.listener;
 
+import cn.hutool.core.lang.tree.Tree;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.TreeBuildUtils;
 import org.dromara.common.excel.core.ExcelOptionsProvider;
+import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.service.ISysDeptService;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -23,7 +27,8 @@ public class DeptExcelOptions implements ExcelOptionsProvider {
     @Override
     public Set<String> getOptions() {
         ISysDeptService deptService = SpringUtils.getBean(ISysDeptService.class);
-        return DeptExcelConverter.buildDeptPathMap(deptService).keySet();
+        List<Tree<Long>> trees = deptService.selectDeptTreeList(new SysDeptBo());
+        return TreeBuildUtils.buildTreeNodeMap(trees, "/", Tree::getName).keySet();
     }
 
 }