Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart_gov_platform
Commits
c320cc86
Commit
c320cc86
authored
May 30, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加站点更新日志
parent
db1f5b33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
...mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+0
-1
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
.../java/com/mortals/xhx/module/site/web/SiteController.java
+4
-5
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @
c320cc86
...
...
@@ -469,7 +469,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
List
<
AreaEntity
>
childList
=
areaService
.
find
(
areaQuery
,
context
);
for
(
AreaEntity
child
:
childList
)
{
siteAreaVo
=
new
SiteAreaVo
();
siteAreaVo
.
setAreaCode
(
child
.
getAreaCode
());
siteAreaVo
.
setAreaName
(
child
.
getName
());
String
matchCode
=
child
.
getAreaCode
().
replaceAll
(
"(0)+$"
,
""
);
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @
c320cc86
...
...
@@ -35,10 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -178,7 +175,9 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
}
}
if
(
ObjectUtils
.
isEmpty
(
site
.
getAreaCodeList
())){
site
.
setAreaCodeList
(
Arrays
.
asList
(
site
.
getAreaCode
()));
}
List
<
SiteEntity
>
siteEntityList
=
site
.
getAreaCodeList
().
stream
().
flatMap
(
areaCode
->{
return
this
.
service
.
getFlatSitesByAreaCode
(
areaCode
,
getContext
()).
stream
();
}).
distinct
().
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