From 1fb2cfb2bcb152bee03f8a332700241693cfd9b6 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 16 八月 2022 13:37:00 +0800
Subject: [PATCH] bug处理

---
 src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java b/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
index 6f23222..0ed9841 100644
--- a/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
@@ -85,12 +85,12 @@
     @Override
     public List<MessageVo> getGroupMessage() {
         ArrayList<MessageVo> messageVos = new ArrayList<>();
-        messageDao.selectList(new QueryWrapper<Message>().orderByDesc("ctime").last("limit 5"))
-                .forEach(a -> {
+        messageDao.selectList(new QueryWrapper<Message>().orderByDesc("ctime")).stream()
+                .filter(item->item.getUserId()!=null).limit(5).forEach(a -> {
                     MessageVo messageVo = new MessageVo();
                     messageVo.setGroupName(groupDao.selectOne(new QueryWrapper<Group>().eq("id", a.getGroupId())).getGroupName());
                     BeanUtils.copyProperties(a, messageVo);
-                    messageVo.setUserName(userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId())).getRealName());
+                    messageVo.setUserName(a.getReportName());
                     messageVos.add(messageVo);
                 });
         return messageVos;

--
Gitblit v1.8.0