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
c2d2ff59
Commit
c2d2ff59
authored
Jan 10, 2022
by
xixinzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
区域树修改
parent
0d156bd6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
AreaServiceImpl.java
...com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java
+4
-4
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java
View file @
c2d2ff59
...
...
@@ -308,10 +308,10 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
private
List
<
UnitAreaTreeVo
>
getAreaChildren
(
UnitAreaTreeVo
root
,
List
<
UnitAreaTreeVo
>
all
)
{
return
all
.
stream
().
filter
(
d
->
StringUtil
.
isNotEmpty
(
d
.
getParentId
())
&&
d
.
getParentId
().
equals
(
root
.
getId
())
||
(
StringUtil
.
isNotEmpty
(
d
.
getBizOrgCode
())
&&
d
.
getBizOrgCode
().
equals
(
root
.
getBizOrgCode
())
&&
!
"area"
.
equals
(
root
.
getType
())
&&
!
d
.
getId
().
equals
(
root
.
getId
()))
//
|| (StringUtil.isNotEmpty(d.getBizOrgCode())
//
&& d.getBizOrgCode().equals(root.getBizOrgCode())
//
&& !"area".equals(root.getType())
//
&& !d.getId().equals(root.getId()))
)
.
peek
(
m
->
m
.
setChildren
(
getAreaChildren
(
m
,
all
)))
.
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