From a93cecfb49c06cd39f363bc6202a8779ab15b06e Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 26 十二月 2022 17:16:17 +0800
Subject: [PATCH] fix: 工作台群消息
---
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
index 63ecf0f..a36d140 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -172,25 +172,26 @@
public PageParam<CauseReportVo> getReporterList(Integer causeId) {
PageParam<Report> PageParam = new PageParam<>();
PageParam<Report> reportPageParam = reportDao.selectPage(PageParam, new QueryWrapper<Report>().eq("cause_id", causeId).orderByDesc("ctime"));
- List<CauseReportVo> causeReportVos = reportPageParam.getRecords().stream()
- .map(
- a -> {
- CauseReportVo causeReportVo = new CauseReportVo();
- User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
- BeanUtils.copyProperties(a, causeReportVo);
- causeReportVo.setMobile(user.getUserMobile());
- causeReportVo.setIdcard(user.getUserIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*"));
- causeReportVo.setReporterName(user.getRealName());
- if (causeReportVo.getIsInGroup()==1) {
- causeReportVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id",causeId)).getId());
- }
- return causeReportVo;
- }
- ).collect(Collectors.toList());
-
PageParam<CauseReportVo> causeReportVoPageParam = new PageParam<>();
BeanUtils.copyProperties(reportPageParam, causeReportVoPageParam);
- causeReportVoPageParam.setRecords(causeReportVos);
+ if (!reportPageParam.getRecords().isEmpty()){
+ List<CauseReportVo> causeReportVos = reportPageParam.getRecords().stream()
+ .map(
+ a -> {
+ CauseReportVo causeReportVo = new CauseReportVo();
+ User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
+ BeanUtils.copyProperties(a, causeReportVo);
+ causeReportVo.setMobile(user.getUserMobile());
+ causeReportVo.setIdcard(user.getUserIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*"));
+ causeReportVo.setReporterName(user.getRealName());
+ if (causeReportVo.getIsInGroup()==1) {
+ causeReportVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id",causeId)).getId());
+ }
+ return causeReportVo;
+ }
+ ).collect(Collectors.toList());
+ causeReportVoPageParam.setRecords(causeReportVos);
+ }
return causeReportVoPageParam;
}
--
Gitblit v1.8.0