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<Notice> noticeList = this.noticeMapper.selectList(queryWrapper);
-        if (CollectionUtils.isNotEmpty(noticeList)) {
-            List<Long> userIdList = noticeList.stream().map(Notice::getUserId).collect(Collectors.toList());
-            List<SysUser> userList = this.userMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                    .in(SysUser::getUserId, userIdList).eq(SysUser::getDelFlag, Constants.UNDELETED));
-            Map<Long, SysUser> 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<Long> userIdList = noticeList.stream().map(Notice::getUserId).collect(Collectors.toList());
+        List<SysUser> userList = this.userMapper.selectList(new LambdaQueryWrapper<SysUser>()
+                .in(SysUser::getUserId, userIdList).eq(SysUser::getDelFlag, Constants.UNDELETED));
+        Map<Long, SysUser> 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));
     }