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
b1a61cb3
Commit
b1a61cb3
authored
May 13, 2023
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
e92d197f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
BuildingServiceImpl.java
...yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
+2
-2
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 @
b1a61cb3
...
...
@@ -1466,9 +1466,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
vo
.
setBizOrgName
(
orgUsrDto
.
getBizOrgName
());
//此处为公共接口 未区分导致消防建筑页面树统计错误
if
(
ment
.
equals
(
"video"
)){
vo
.
setTotal
(
buildingTreeVos
.
stream
().
filter
(
b
->
!
ObjectUtils
.
isEmpty
(
b
.
getBizOrgCode
())
&&
b
.
getBizOrgCode
().
contains
(
ObjectUtils
.
isEmpty
(
vo
.
getBizOrgCode
())?
""
:
vo
.
getBizOrgCode
())
&&
"building"
.
equals
(
b
.
getGroupType
())).
count
());
}
else
{
vo
.
setTotal
(!
StringUtils
.
isEmpty
(
orgUsrDto
.
getBizOrgCode
())
?
formInstanceMapper
.
queryVideoCountByBizOrgCode
(
orgUsrDto
.
getBizOrgCode
())
:
0L
);
}
else
{
vo
.
setTotal
(
buildingTreeVos
.
stream
().
filter
(
b
->
!
ObjectUtils
.
isEmpty
(
b
.
getBizOrgCode
())
&&
b
.
getBizOrgCode
().
contains
(
ObjectUtils
.
isEmpty
(
vo
.
getBizOrgCode
())?
""
:
vo
.
getBizOrgCode
())
&&
"building"
.
equals
(
b
.
getGroupType
())).
count
());
}
return
vo
;
}).
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