From 744cd0a3bc66de73a94e320724b1bb776a6e4080 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 19 十月 2022 17:43:50 +0800
Subject: [PATCH] 更新minlo
---
src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 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 0ed9841..b4542c9 100644
--- a/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/WorkbenchServiceImpl.java
@@ -3,8 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.jz.dao.*;
import com.example.jz.modle.entity.*;
-import com.example.jz.modle.vo.ReportVo;
import com.example.jz.modle.vo.MessageVo;
+import com.example.jz.modle.vo.ReportVo;
import com.example.jz.service.WorkbenchService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -69,30 +69,36 @@
//鏌ヨ寰呭鏍镐汉
List<Report> reports = reportDao.selectList(new QueryWrapper<Report>().eq("status", 0).orderByDesc("ctime").last("limit 5"));
ArrayList<ReportVo> reportVos = new ArrayList<>();
- reports.forEach(a -> {
- User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
- ReportVo reportVo = new ReportVo();
- reportVo.setReporterName(user.getRealName());
- String regex = "(?<=[\\d]{3})\\d(?=[\\d]{4})";
- reportVo.setIdcard(user.getUserIdcard().replaceAll(regex, "*"));
- reportVo.setMobile(user.getUserMobile());
- reportVo.setId(a.getId());
- reportVos.add(reportVo);
- });
+ if(!reports.isEmpty()){
+ reports.forEach(a -> {
+ User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
+ ReportVo reportVo = new ReportVo();
+ if (user!=null){
+ reportVo.setReporterName(user.getRealName());
+ 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;
}
@Override
public List<MessageVo> getGroupMessage() {
ArrayList<MessageVo> messageVos = new ArrayList<>();
- 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(a.getReportName());
- messageVos.add(messageVo);
- });
+ if (!messageVos.isEmpty()){
+ 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(a.getReportName());
+ messageVos.add(messageVo);
+ });
+ }
return messageVos;
}
}
--
Gitblit v1.8.0