From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 24 十一月 2022 15:14:47 +0800 Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回 --- ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 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..d821a4a 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,6 @@ package com.ruoyi.system.service; -import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.TreeSelect; +import cn.hutool.core.lang.tree.Tree; import com.ruoyi.common.core.domain.entity.SysDept; import java.util.List; @@ -11,7 +10,7 @@ * * @author Lion Li */ -public interface ISysDeptService extends IService<SysDept> { +public interface ISysDeptService { /** * 鏌ヨ閮ㄩ棬绠$悊鏁版嵁 * @@ -21,12 +20,12 @@ List<SysDept> selectDeptList(SysDept dept); /** - * 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯 + * 鏌ヨ閮ㄩ棬鏍戠粨鏋勪俊鎭� * - * @param depts 閮ㄩ棬鍒楄〃 - * @return 鏍戠粨鏋勫垪琛� + * @param dept 閮ㄩ棬淇℃伅 + * @return 閮ㄩ棬鏍戜俊鎭泦鍚� */ - List<SysDept> buildDeptTree(List<SysDept> depts); + List<Tree<Long>> selectDeptTreeList(SysDept dept); /** * 鏋勫缓鍓嶇鎵�闇�瑕佷笅鎷夋爲缁撴瀯 @@ -34,7 +33,7 @@ * @param depts 閮ㄩ棬鍒楄〃 * @return 涓嬫媺鏍戠粨鏋勫垪琛� */ - List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts); + List<Tree<Long>> buildDeptTreeSelect(List<SysDept> depts); /** * 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭� @@ -42,7 +41,7 @@ * @param roleId 瑙掕壊ID * @return 閫変腑閮ㄩ棬鍒楄〃 */ - List<Integer> selectDeptListByRoleId(Long roleId); + List<Long> selectDeptListByRoleId(Long roleId); /** * 鏍规嵁閮ㄩ棬ID鏌ヨ淇℃伅 @@ -53,7 +52,7 @@ SysDept selectDeptById(Long deptId); /** - * 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬锛堟甯哥姸鎬侊級 + * 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬鏁帮紙姝e父鐘舵�侊級 * * @param deptId 閮ㄩ棬ID * @return 瀛愰儴闂ㄦ暟 -- Gitblit v1.9.3