From 289c5689431139bd3bd126b561cef9743f405c20 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 11 Sep 2021 17:20:42 +0800
Subject: [PATCH] 通知公告修改
---
src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java b/src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java
index a162b1f..d414e7b 100644
--- a/src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java
@@ -24,9 +24,12 @@
import org.springblade.modules.desk.mapper.NoticeMapper;
import org.springblade.modules.desk.service.INoticeService;
import org.springblade.modules.desk.vo.NoticeVO;
+import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
/**
@@ -40,14 +43,31 @@
private IDeptService deptService;
+
+ private IUserService userService;
+
@Override
public IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice) {
// 若不使用mybatis-plus自带的分页方法，则不会自动带入tenantId，所以我们需要自行注入
notice.setTenantId(AuthUtil.getTenantId());
List<NoticeVO> noticeVOS = baseMapper.selectNoticePage(page, notice);
-// noticeVOS.forEach(noticeVO -> {
-// noticeVO.setDeptName(deptService.getById(noticeVO.getDeptId()).getDeptName());
-// });
+ if (noticeVOS.size()>0){
+ noticeVOS.forEach(noticeVO -> {
+ if (null!=noticeVO.getReceivedIds()){
+ List<String> receivedIds = Arrays.asList(noticeVO.getReceivedIds());
+ //查询用户信息
+ StringBuilder replyRealNameInfo = new StringBuilder();
+ for (String userId : receivedIds) {
+ User user = userService.getById(userId);
+ if (null!=user){
+ replyRealNameInfo = replyRealNameInfo.append(user.getRealName()).append(",");
+ }
+ }
+ //截取
+ noticeVO.setReceivedName(replyRealNameInfo.substring(0, replyRealNameInfo.length() - 1));
+ }
+ });
+ }
return page.setRecords(noticeVOS);
}
--
Gitblit v1.9.3