From d60406e8f251a7c8343825403f5fd71de1680975 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 08 八月 2022 13:31:48 +0800
Subject: [PATCH] bug解决
---
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 40f186f..74f45d3 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -125,8 +125,10 @@
}
@Override
- public List<CauseReportVo> getReporterList(Integer causeId) {
- return reportDao.selectList(new QueryWrapper<Report>().eq("cause_id", causeId)).stream()
+ public PageParam<CauseReportVo> getReporterList(Integer causeId) {
+ PageParam<Report> PageParam = new PageParam<>();
+ PageParam<Report> reportPageParam = reportDao.selectPage(PageParam, new QueryWrapper<Report>().eq("cause_id", causeId));
+ List<CauseReportVo> causeReportVos = reportPageParam.getRecords().stream()
.map(
a -> {
CauseReportVo causeReportVo = new CauseReportVo();
@@ -136,9 +138,20 @@
causeReportVo.setUserMobile(user.getUserMobile());
causeReportVo.setUserIdcard(causeReportVo.getUserIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*"));
causeReportVo.setUserName(user.getRealName());
+ if (groupUserDao.selectOne(new QueryWrapper<GroupUser>().eq("user_id", a.getId())) == null) {
+ causeReportVo.setIsIntoGroup("0");
+ } else {
+ causeReportVo.setIsIntoGroup("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);
+ return causeReportVoPageParam;
}
@Override
@@ -149,6 +162,7 @@
@Override
public void deleteCause(Integer id) {
causeDao.deleteById(id);
+ groupDao.delete(new QueryWrapper<Group>().eq("cause_id", id));
}
@Override
@@ -159,7 +173,7 @@
EasyExcel.read(multipartFile.getInputStream(), CauseLoadDto.class, new AnalysisEventListener<CauseLoadDto>() {
@Override
public void invoke(CauseLoadDto data, AnalysisContext context) {
- if (StringUtils.isNotBlank(data.getName())&&StringUtils.isNotBlank(data.getUserName())){
+ if (StringUtils.isNotBlank(data.getName()) && StringUtils.isNotBlank(data.getUserName())) {
causeLoadDtos.add(data);
}
}
--
Gitblit v1.8.0