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
733ce760
Commit
733ce760
authored
Jan 12, 2023
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改admin账号登陆时不在加载站点列表
parent
2976b64d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
7 deletions
+17
-7
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
.../java/com/mortals/xhx/module/site/web/SiteController.java
+17
-7
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @
733ce760
...
@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -261,14 +262,23 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
...
@@ -261,14 +262,23 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
String
busiDesc
=
"查询"
+
this
.
getModuleDesc
();
String
busiDesc
=
"查询"
+
this
.
getModuleDesc
();
int
code
=
1
;
int
code
=
1
;
try
{
try
{
if
(
CollectionUtils
.
isNotEmpty
(
query
.
getAreaCodeList
()))
{
if
(
this
.
getCurUser
().
getId
()==
1
){
List
<
SiteEntity
>
siteEntityList
=
query
.
getAreaCodeList
().
parallelStream
().
flatMap
(
areaId
->
List
<
SiteEntity
>
siteEntityList
=
new
ArrayList
<>();
this
.
service
.
getFlatSitesByAreaCode
(
areaId
,
getContext
()).
stream
()
SiteEntity
siteEntity
=
new
SiteEntity
();
).
distinct
().
collect
(
Collectors
.
toList
());
siteEntity
.
setId
(
0
l
);
siteEntity
.
setSiteName
(
"无站点"
);
siteEntityList
.
add
(
siteEntity
);
model
.
put
(
"data"
,
siteEntityList
);
model
.
put
(
"data"
,
siteEntityList
);
}
else
{
}
else
{
List
<
SiteEntity
>
result
=
this
.
getService
().
find
(
query
,
context
);
if
(
CollectionUtils
.
isNotEmpty
(
query
.
getAreaCodeList
()))
{
model
.
put
(
"data"
,
result
);
List
<
SiteEntity
>
siteEntityList
=
query
.
getAreaCodeList
().
parallelStream
().
flatMap
(
areaId
->
this
.
service
.
getFlatSitesByAreaCode
(
areaId
,
getContext
()).
stream
()
).
distinct
().
collect
(
Collectors
.
toList
());
model
.
put
(
"data"
,
siteEntityList
);
}
else
{
List
<
SiteEntity
>
result
=
this
.
getService
().
find
(
query
,
context
);
model
.
put
(
"data"
,
result
);
}
}
}
model
.
put
(
"message_info"
,
busiDesc
+
"成功"
);
model
.
put
(
"message_info"
,
busiDesc
+
"成功"
);
this
.
recordSysLog
(
this
.
request
,
busiDesc
+
" 【成功】"
);
this
.
recordSysLog
(
this
.
request
,
busiDesc
+
" 【成功】"
);
...
...
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