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
ec23f567
Commit
ec23f567
authored
Jul 06, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加用户查询列表
parent
4ad6162c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java
...ava/com/mortals/xhx/module/site/model/SiteTreeSelect.java
+14
-0
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
...mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+0
-1
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java
View file @
ec23f567
...
...
@@ -43,6 +43,15 @@ public class SiteTreeSelect implements Serializable {
*/
private
Boolean
isLeaf
;
/**
* 经度
*/
private
String
longitude
;
/**
* 纬度
*/
private
String
latitude
;
/**
* 节点类型
*/
...
...
@@ -84,6 +93,8 @@ public class SiteTreeSelect implements Serializable {
this
.
siteCode
=
collect
.
stream
().
map
(
item
->
item
.
getSiteCode
()).
collect
(
Collectors
.
joining
(
","
));
this
.
type
=
"site"
;
this
.
icon
=
"el-icon-document"
;
this
.
longitude
=
collect
.
stream
().
findFirst
().
map
(
item
->
item
.
getLongitude
()).
orElseGet
(()
->
""
);
this
.
latitude
=
collect
.
stream
().
findFirst
().
map
(
item
->
item
.
getLatitude
()).
orElseGet
(()
->
""
);
}
else
{
this
.
id
=
entity
.
getIid
();
this
.
label
=
entity
.
getName
();
...
...
@@ -109,6 +120,9 @@ public class SiteTreeSelect implements Serializable {
this
.
type
=
"site"
;
this
.
icon
=
"el-icon-document"
;
this
.
longitude
=
entity
.
getLongitude
();
this
.
latitude
=
entity
.
getLatitude
();
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @
ec23f567
...
...
@@ -213,7 +213,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
for
(
SiteEntity
siteEntity
:
siteEntities
)
{
boolean
bool
=
getSite
(
areaCode
,
siteEntity
.
getAreaCode
(),
siteList
,
siteEntity
);
if
(
bool
)
continue
;
}
return
siteList
;
}
...
...
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