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
d2dc30ff
Commit
d2dc30ff
authored
Oct 20, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加初始化数据库脚本
parent
2ee2803c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
...mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+2
-3
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @
d2dc30ff
...
@@ -89,8 +89,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
...
@@ -89,8 +89,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
SiteQuery
siteQuery
=
new
SiteQuery
();
SiteQuery
siteQuery
=
new
SiteQuery
();
Set
<
String
>
siteSet
=
Arrays
.
stream
(
context
.
getUser
().
getSiteIds
().
split
(
","
)).
filter
(
f
->
!
f
.
equals
(
""
)).
collect
(
Collectors
.
toSet
());
Set
<
String
>
siteSet
=
Arrays
.
stream
(
context
.
getUser
().
getSiteIds
().
split
(
","
)).
filter
(
f
->
!
f
.
equals
(
""
)).
collect
(
Collectors
.
toSet
());
log
.
info
(
"initSiteIds==>{}"
,
JSON
.
toJSONString
(
siteSet
));
if
(!
ObjectUtils
.
isEmpty
(
siteSet
))
{
if
(!
ObjectUtils
.
isEmpty
(
siteSet
))
{
List
<
Long
>
siteIdList
=
siteSet
.
stream
().
map
(
Long:
:
parseLong
).
collect
(
Collectors
.
toList
());
List
<
Long
>
siteIdList
=
siteSet
.
stream
().
map
(
Long:
:
parseLong
).
collect
(
Collectors
.
toList
());
if
(!
ObjectUtils
.
isEmpty
(
siteIdList
))
{
if
(!
ObjectUtils
.
isEmpty
(
siteIdList
))
{
...
@@ -102,6 +100,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
...
@@ -102,6 +100,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
List
<
SiteEntity
>
siteList
=
this
.
find
(
siteQuery
);
List
<
SiteEntity
>
siteList
=
this
.
find
(
siteQuery
);
//如果是管理员 默认全部站点
//如果是管理员 默认全部站点
if
(
context
.
getUser
().
isAdmin
()){
if
(
context
.
getUser
().
isAdmin
()){
log
.
info
(
"user is admin !"
);
siteList
=
this
.
find
(
new
SiteQuery
());
siteList
=
this
.
find
(
new
SiteQuery
());
}
}
...
@@ -119,7 +118,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
...
@@ -119,7 +118,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
recursionFn
(
areaMap
,
areaEntity
);
recursionFn
(
areaMap
,
areaEntity
);
}
}
}
}
log
.
info
(
"rebuildAreaMap==>{}"
,
JSON
.
toJSONString
(
areaMap
));
//
log.info("rebuildAreaMap==>{}", JSON.toJSONString(areaMap));
//areaMap 为当前站点相关区域树结构 已经剔除不必要的分支结构
//areaMap 为当前站点相关区域树结构 已经剔除不必要的分支结构
return
buildSiteTreeSelect
(
areaMap
,
siteMap
);
return
buildSiteTreeSelect
(
areaMap
,
siteMap
);
}
}
...
...
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