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
6335d4f6
Commit
6335d4f6
authored
Feb 16, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
d16cae89
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
BuildingServiceImpl.java
...yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
+3
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
View file @
6335d4f6
...
@@ -1234,10 +1234,10 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
...
@@ -1234,10 +1234,10 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
public
List
<
BuildingTreeVo
>
getBuildingTreeInOrgCode
(
String
bizOrgCode
)
{
public
List
<
BuildingTreeVo
>
getBuildingTreeInOrgCode
(
String
bizOrgCode
)
{
//如果传递的为部门bizOrgCode 取其上级单位下的建筑
//如果传递的为部门bizOrgCode 取其上级单位下的建筑
ResponseModel
<
OrgUsrDto
>
companyByBizOrgCodeList
=
jcsFeign
.
getCompanyByBizOrgCodeList
(
bizOrgCode
);
//
ResponseModel<OrgUsrDto> companyByBizOrgCodeList = jcsFeign.getCompanyByBizOrgCodeList(bizOrgCode);
String
resultCode
=
companyByBizOrgCodeList
.
getResult
().
getBizOrgCode
();
//
String resultCode = companyByBizOrgCodeList.getResult().getBizOrgCode();
List
<
BuildingTreeVo
>
buildingTreeVos
=
this
.
getBuildingTreeVos
(
true
);
List
<
BuildingTreeVo
>
buildingTreeVos
=
this
.
getBuildingTreeVos
(
true
);
List
<
BuildingTreeVo
>
orgBuildingTreeVos
=
buildingTreeVos
.
stream
().
filter
(
b
->
b
.
getBizOrgCode
()
!=
null
&&
b
.
getBizOrgCode
().
contains
(
result
Code
)).
collect
(
Collectors
.
toList
());
List
<
BuildingTreeVo
>
orgBuildingTreeVos
=
buildingTreeVos
.
stream
().
filter
(
b
->
b
.
getBizOrgCode
()
!=
null
&&
b
.
getBizOrgCode
().
contains
(
bizOrg
Code
)).
collect
(
Collectors
.
toList
());
return
buildingTreeVos
.
stream
().
filter
(
b
->
"-1"
.
equals
(
b
.
getParentId
())).
peek
(
b
->
{
return
buildingTreeVos
.
stream
().
filter
(
b
->
"-1"
.
equals
(
b
.
getParentId
())).
peek
(
b
->
{
b
.
setId
(
0L
);
b
.
setId
(
0L
);
b
.
setChildren
(
this
.
getCompanyBuildingChildrenTree
(
b
.
getId
().
toString
(),
orgBuildingTreeVos
));
b
.
setChildren
(
this
.
getCompanyBuildingChildrenTree
(
b
.
getId
().
toString
(),
orgBuildingTreeVos
));
...
...
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