Skip to content

P
peizhen-java
Commit 4fb4f80c by sdif
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 2b1969b3 ca52caee
Showing with 4 additions and 3 deletions
pz-applet/src/main/java/com/pz/applet/AppletSessionListController.java
...@@ -89,8 +89,8 @@ public class AppletSessionListController extends BaseController { ...@@ -89,8 +89,8 @@ public class AppletSessionListController extends BaseController {
sessionListVo.setMessage(messageVos.get(0).getContent()); sessionListVo.setMessage(messageVos.get(0).getContent());
} else { } else {
List<MessageVo> messageVoList = messageMapper.selectVoList(Wrappers.<Message>lambdaQuery() List<MessageVo> messageVoList = messageMapper.selectVoList(Wrappers.<Message>lambdaQuery()
.eq(Message::getSender, targetUserId) .eq(Message::getSender, getUserId())
.eq(Message::getReceiver, getUserId()) .eq(Message::getReceiver, targetUserId)
.eq(Message::getIsRead, 1) .eq(Message::getIsRead, 1)
.orderByDesc(Message::getCreateTime)); .orderByDesc(Message::getCreateTime));
if (CollectionUtils.isNotEmpty(messageVoList)) { if (CollectionUtils.isNotEmpty(messageVoList)) {
......
pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
yyod.over_time AS overtime, yyod.over_time AS overtime,
yyod.voucher AS voucher, yyod.voucher AS voucher,
su.user_name AS userName, su.user_name AS userName,
yyod.create_Time as createTime yyod.create_Time as createTime,
yyod.time_of_appointment as timeOfAppointment
FROM zqgh_order AS yyod FROM zqgh_order AS yyod
LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
LEFT JOIN city AS c ON c.id = tlo.city_id LEFT JOIN city AS c ON c.id = tlo.city_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment