Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
3b8a68c4
Commit
3b8a68c4
authored
Dec 03, 2022
by
RuoYi
Browse files
升级oshi到最新版本6.3.2
parent
9aae863c
Changes
3
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
3b8a68c4
...
...
@@ -25,7 +25,7 @@
<mybatis-spring-boot.version>
2.2.2
</mybatis-spring-boot.version>
<pagehelper.boot.version>
1.4.5
</pagehelper.boot.version>
<fastjson.version>
2.0.16
</fastjson.version>
<oshi.version>
6.3.
0
</oshi.version>
<oshi.version>
6.3.
2
</oshi.version>
<commons.io.version>
2.11.0
</commons.io.version>
<commons.fileupload.version>
1.4
</commons.fileupload.version>
<commons.collections.version>
3.2.2
</commons.collections.version>
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View file @
3b8a68c4
...
...
@@ -71,11 +71,7 @@ public class SysDeptServiceImpl implements ISysDeptService
public
List
<
SysDept
>
buildDeptTree
(
List
<
SysDept
>
depts
)
{
List
<
SysDept
>
returnList
=
new
ArrayList
<
SysDept
>();
List
<
Long
>
tempList
=
new
ArrayList
<
Long
>();
for
(
SysDept
dept
:
depts
)
{
tempList
.
add
(
dept
.
getDeptId
());
}
List
<
Long
>
tempList
=
depts
.
stream
().
map
(
SysDept:
:
getDeptId
).
collect
(
Collectors
.
toList
());
for
(
SysDept
dept
:
depts
)
{
// 如果是顶级节点, 遍历该父节点的所有子节点
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View file @
3b8a68c4
...
...
@@ -223,11 +223,7 @@ public class SysMenuServiceImpl implements ISysMenuService
public
List
<
SysMenu
>
buildMenuTree
(
List
<
SysMenu
>
menus
)
{
List
<
SysMenu
>
returnList
=
new
ArrayList
<
SysMenu
>();
List
<
Long
>
tempList
=
new
ArrayList
<
Long
>();
for
(
SysMenu
dept
:
menus
)
{
tempList
.
add
(
dept
.
getMenuId
());
}
List
<
Long
>
tempList
=
menus
.
stream
().
map
(
SysMenu:
:
getMenuId
).
collect
(
Collectors
.
toList
());
for
(
Iterator
<
SysMenu
>
iterator
=
menus
.
iterator
();
iterator
.
hasNext
();)
{
SysMenu
menu
=
(
SysMenu
)
iterator
.
next
();
...
...
@@ -479,8 +475,8 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* 递归列表
*
* @param list
* @param t
* @param list
分类表
* @param t
子节点
*/
private
void
recursionFn
(
List
<
SysMenu
>
list
,
SysMenu
t
)
{
...
...
@@ -525,7 +521,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* 内链域名特殊字符替换
*
* @return
* @return
替换后的内链域名
*/
public
String
innerLinkReplaceEach
(
String
path
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment