Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
af5d861b
authored
Nov 10, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:长者信息
parent
4f99ac8f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
View file @
af5d861b
...
...
@@ -255,7 +255,8 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
@Override
public
List
<
PlatElderChildrenInfoWechatVO
>
listByOpenid
(
String
openid
)
{
List
<
PlatElderChildrenInfo
>
platElderChildrenInfoList
=
list
(
new
QueryWrapper
<
PlatElderChildrenInfo
>().
lambda
().
eq
(
PlatElderChildrenInfo:
:
getOpenid
,
openid
)
List
<
PlatElderChildrenInfo
>
platElderChildrenInfoList
=
list
(
new
QueryWrapper
<
PlatElderChildrenInfo
>().
lambda
()
.
eq
(
PlatElderChildrenInfo:
:
getOpenid
,
openid
)
.
isNotNull
(
PlatElderChildrenInfo:
:
getElderId
));
if
(
CollectionUtils
.
isEmpty
(
platElderChildrenInfoList
))
{
...
...
@@ -264,14 +265,21 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
List
<
String
>
elderIdList
=
StreamUtil
.
map
(
platElderChildrenInfoList
,
PlatElderChildrenInfo:
:
getElderId
);
List
<
PlatElder
>
platElders
=
platElderService
.
listByIds
(
elderIdList
);
if
(
CollectionUtils
.
isEmpty
(
platElders
))
{
return
Lists
.
newArrayList
();
}
List
<
PlatElderListVO
>
list
=
BeanDtoVoUtils
.
listVo
(
platElders
,
PlatElderListVO
.
class
);
platElderService
.
fill
(
list
);
Map
<
String
,
PlatElderListVO
>
elderListVOMap
=
StreamUtil
.
toMap
Dep
(
list
,
BaseIdDTO:
:
getId
);
Map
<
String
,
PlatElderListVO
>
elderListVOMap
=
StreamUtil
.
toMap
(
list
,
BaseIdDTO:
:
getId
);
List
<
PlatElderChildrenInfoWechatVO
>
voList
=
Lists
.
newArrayList
();
for
(
PlatElderChildrenInfo
platElderChildrenInfo
:
platElderChildrenInfoList
)
{
PlatElderChildrenInfoWechatVO
vo
=
BeanDtoVoUtils
.
convert
(
platElderChildrenInfo
,
PlatElderChildrenInfoWechatVO
.
class
);
vo
.
setPlatElder
(
elderListVOMap
.
getOrDefault
(
platElderChildrenInfo
.
getElderId
(),
new
PlatElderListVO
()));
PlatElderListVO
platElderListVO
=
elderListVOMap
.
get
(
platElderChildrenInfo
.
getElderId
());
if
(
platElderListVO
==
null
)
{
continue
;
}
vo
.
setPlatElder
(
platElderListVO
);
voList
.
add
(
vo
);
}
...
...
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