From dd37247e65374dd4ef7e8e8b9212d8f29023e301 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 十二月 2021 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
index ea6afa2..292d43c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.service;
+import cn.hutool.core.lang.tree.Tree;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept;
import java.util.List;
@@ -21,20 +21,12 @@
List<SysDept> selectDeptList(SysDept dept);
/**
- * 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯
- *
- * @param depts 閮ㄩ棬鍒楄〃
- * @return 鏍戠粨鏋勫垪琛�
- */
- List<SysDept> buildDeptTree(List<SysDept> depts);
-
- /**
* 鏋勫缓鍓嶇鎵�闇�瑕佷笅鎷夋爲缁撴瀯
*
* @param depts 閮ㄩ棬鍒楄〃
* @return 涓嬫媺鏍戠粨鏋勫垪琛�
*/
- List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
+ List<Tree<Long>> buildDeptTreeSelect(List<SysDept> depts);
/**
* 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭�
@@ -42,7 +34,7 @@
* @param roleId 瑙掕壊ID
* @return 閫変腑閮ㄩ棬鍒楄〃
*/
- List<Integer> selectDeptListByRoleId(Long roleId);
+ List<Long> selectDeptListByRoleId(Long roleId);
/**
* 鏍规嵁閮ㄩ棬ID鏌ヨ淇℃伅
--
Gitblit v1.9.3