Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
eb84867f
Commit
eb84867f
authored
Mar 22, 2022
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug :4306 的修改
parent
8aee1bc6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
TreeNodeUtil.java
...va/com/yeejoin/equipmanage/common/utils/TreeNodeUtil.java
+1
-0
MaintenanceResourceServiceImpl.java
...ipmanage/service/impl/MaintenanceResourceServiceImpl.java
+0
-4
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/TreeNodeUtil.java
View file @
eb84867f
...
...
@@ -279,6 +279,7 @@ public class TreeNodeUtil {
if
(!
CollectionUtils
.
isEmpty
(
node
.
getChildren
()))
{
for
(
Object
t
:
node
.
getChildren
())
{
//递归
listNodes
.
remove
(
t
);
assembleTree
((
T
)
t
,
listNodes
);
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MaintenanceResourceServiceImpl.java
View file @
eb84867f
...
...
@@ -178,10 +178,6 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
@Override
public
List
<
MaintenanceResourceDto
>
findTreeById
(
Long
id
)
{
List
<
MaintenanceResourceDto
>
list
=
maintenanceResourceMapper
.
findTreeById
(
id
);
Set
<
MaintenanceResourceDto
>
set
=
new
HashSet
<
MaintenanceResourceDto
>();
set
.
addAll
(
list
);
list
.
clear
();
list
.
addAll
(
set
);
if
(!
CollectionUtils
.
isEmpty
(
list
))
{
List
<
MaintenanceResourceDto
>
dtoList
=
TreeNodeUtil
.
assembleTreeNotFilter
(
list
);
//&& x.getId().equals(Long.toString(id)) 这一段用于生成树之后并没有把树子节点数据从list列表删除造成的脏数据的问题 by chenhao 2022-01-12
List
<
MaintenanceResourceDto
>
collect
=
dtoList
.
stream
().
filter
(
x
->
!
MaintenanceResourceEnum
.
CLASSIFY
.
getValue
().
equals
(
x
.
getType
())
&&
x
.
getId
().
equals
(
Long
.
toString
(
id
))).
collect
(
Collectors
.
toList
());
...
...
Write
Preview
Markdown
is supported
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