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
d365cf3f
Commit
d365cf3f
authored
Apr 06, 2023
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
a71002f4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
CompanyTreeDto.java
...eejoin/amos/boot/module/jxiop/api/dto/CompanyTreeDto.java
+3
-0
HouseholdPvDistrictServiceImpl.java
...xiop/biz/service/impl/HouseholdPvDistrictServiceImpl.java
+7
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/CompanyTreeDto.java
View file @
d365cf3f
...
...
@@ -18,4 +18,7 @@ public class CompanyTreeDto {
private
String
level
;
private
List
<
CompanyTreeDto
>
children
;
private
boolean
disabled
;
}
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HouseholdPvDistrictServiceImpl.java
View file @
d365cf3f
...
...
@@ -43,6 +43,7 @@ public class HouseholdPvDistrictServiceImpl extends BaseService<HouseholdPvDistr
@Autowired
HouseholdPvDistrictMapper
householdPvDistrictMapper
;
static
final
String
STATION_LEVEL
=
"level"
;
/**
* 分页查询
*/
...
...
@@ -161,7 +162,12 @@ public class HouseholdPvDistrictServiceImpl extends BaseService<HouseholdPvDistr
BeanUtils
.
copyProperties
(
item
,
dto
,
"children"
);
Map
<
String
,
Object
>
detail
=
(
Map
<
String
,
Object
>)
item
.
getObject
();
if
(!
ObjectUtils
.
isEmpty
(
detail
))
{
dto
.
setLevel
(
detail
.
getOrDefault
(
"level"
,
""
).
toString
());
if
(!
ObjectUtils
.
isEmpty
(
detail
.
get
(
STATION_LEVEL
))
&&
"station"
.
equals
(
detail
.
get
(
STATION_LEVEL
))){
dto
.
setLevel
(
detail
.
get
(
STATION_LEVEL
).
toString
());
dto
.
setDisabled
(
false
);
}
else
{
dto
.
setDisabled
(
true
);
}
}
result
.
add
(
dto
);
if
(!
ObjectUtils
.
isEmpty
(
item
.
getChildren
()))
{
...
...
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