From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java | 6 +++---
1 files changed, 3 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 fffee0b..a162b1f 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
@@ -45,9 +45,9 @@
// 若不使用mybatis-plus自带的分页方法，则不会自动带入tenantId，所以我们需要自行注入
notice.setTenantId(AuthUtil.getTenantId());
List<NoticeVO> noticeVOS = baseMapper.selectNoticePage(page, notice);
- noticeVOS.forEach(noticeVO -> {
- noticeVO.setDeptName(deptService.getById(noticeVO.getDeptId()).getDeptName());
- });
+// noticeVOS.forEach(noticeVO -> {
+// noticeVO.setDeptName(deptService.getById(noticeVO.getDeptId()).getDeptName());
+// });
return page.setRecords(noticeVOS);
}
--
Gitblit v1.9.3