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 | 8 +++++---
1 files changed, 5 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 8745bdf..0ed9841 100644
--- a/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
@@ -66,6 +66,7 @@
@Override
public List<ReportVo> getAllCheckPendingList() {
+ //鏌ヨ寰呭鏍镐汉
List<Report> reports = reportDao.selectList(new QueryWrapper<Report>().eq("status", 0).orderByDesc("ctime").last("limit 5"));
ArrayList<ReportVo> reportVos = new ArrayList<>();
reports.forEach(a -> {
@@ -75,6 +76,7 @@
String regex = "(?<=[\\d]{3})\\d(?=[\\d]{4})";
reportVo.setIdcard(user.getUserIdcard().replaceAll(regex, "*"));
reportVo.setMobile(user.getUserMobile());
+ reportVo.setId(a.getId());
reportVos.add(reportVo);
});
return reportVos;
@@ -83,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