From 3be17eda0f254c642cf788c6949443268f4e5a5b Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 1 Dec 2025 16:55:52 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=85=AC=E5=91=8A=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9EnoticeType=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/xkt/dto/notice/NoticeResDTO.java | 2 ++ .../ruoyi/xkt/service/impl/NoticeServiceImpl.java | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/notice/NoticeResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/notice/NoticeResDTO.java index 3a35ce478..4e8205786 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/notice/NoticeResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/notice/NoticeResDTO.java @@ -24,6 +24,8 @@ public class NoticeResDTO { private Long id; @ApiModelProperty(value = "公告标题") private String noticeTitle; + @ApiModelProperty(value = "公告类型（1通知 2公告）") + private Integer noticeType; @ApiModelProperty(value = "公告内容") private String noticeContent; @ApiModelProperty(value = "谁发的公告 1 档口 2 系统") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java index 16c6be2b4..4ffee52b1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java @@ -158,14 +158,15 @@ public class NoticeServiceImpl implements INoticeService { } PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize()); List noticeList = this.noticeMapper.selectList(queryWrapper); - if (CollectionUtils.isNotEmpty(noticeList)) { - List userIdList = noticeList.stream().map(Notice::getUserId).collect(Collectors.toList()); - List userList = this.userMapper.selectList(new LambdaQueryWrapper() - .in(SysUser::getUserId, userIdList).eq(SysUser::getDelFlag, Constants.UNDELETED)); - Map userMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId, x -> x)); - noticeList.forEach(x -> x.setCreateBy(userMap.containsKey(x.getUserId()) ? - userMap.get(x.getUserId()).getUserName() : "")); + if (CollectionUtils.isEmpty(noticeList)) { + return Page.empty(pageDTO.getPageSize(), pageDTO.getPageNum()); } + List userIdList = noticeList.stream().map(Notice::getUserId).collect(Collectors.toList()); + List userList = this.userMapper.selectList(new LambdaQueryWrapper() + .in(SysUser::getUserId, userIdList).eq(SysUser::getDelFlag, Constants.UNDELETED)); + Map userMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId, x -> x)); + noticeList.forEach(x -> x.setCreateBy(userMap.containsKey(x.getUserId()) ? + userMap.get(x.getUserId()).getUserName() : "")); return Page.convert(new PageInfo<>(noticeList), BeanUtil.copyToList(noticeList, NoticeResDTO.class)); }