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 { /** * 构建部门路径 → 树节点映射,供 Converter 和 Options 共用 */ - static Map> buildDeptPathMap(ISysDeptService deptService) { + private Map> 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 getOptions() { ISysDeptService deptService = SpringUtils.getBean(ISysDeptService.class); - return DeptExcelConverter.buildDeptPathMap(deptService).keySet(); + List> trees = deptService.selectDeptTreeList(new SysDeptBo()); + return TreeBuildUtils.buildTreeNodeMap(trees, "/", Tree::getName).keySet(); } }