From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 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 bb6413b..fd5b3e1 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
@@ -17,13 +17,20 @@
 package org.springblade.modules.desk.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.modules.desk.entity.Notice;
 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;
 
 /**
  * 服务实现类
@@ -31,13 +38,37 @@
  * @author Chill
  */
 @Service
+@AllArgsConstructor
 public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> implements INoticeService {
+
+	private IDeptService deptService;
+
+
+	private IUserService userService;
 
 	@Override
 	public IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice) {
 		// 若不使用mybatis-plus自带的分页方法,则不会自动带入tenantId,所以我们需要自行注入
 		notice.setTenantId(AuthUtil.getTenantId());
-		return page.setRecords(baseMapper.selectNoticePage(page, notice));
+		List<NoticeVO> noticeVOS = baseMapper.selectNoticePage(page, notice);
+		if (noticeVOS.size()>0){
+			noticeVOS.forEach(noticeVO -> {
+				if (null!=noticeVO.getReceivedIds()){
+					List<String> receivedIds = Arrays.asList(noticeVO.getReceivedIds().split(","));
+					//查询用户信息
+					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