diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NoticeExcel.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NoticeExcel.java index 3318ed41..5321d7d2 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NoticeExcel.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NoticeExcel.java @@ -31,22 +31,18 @@ import java.util.Date; @Data public class NoticeExcel { - @Excel(name = "通知标题") - private String noticeTitle; - @Excel(name = "所属模块") private String categoryName; - @Excel(name = "联系电话") - private String mobile; - - @Excel(name = "阅读量") - private Integer readingAmount; - - @Excel(name = "已发布") - private String noticeReleaseState; + @Excel(name = "标题") + private String noticeTitle; @Excel(name = "发布时间") private String releaseTimeStr; + @Excel(name = "阅读量") + private Integer readingAmount; + + @Excel(name = "通知内容") + private String noticeContent; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index 289967d4..40fe8609 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java @@ -417,12 +417,15 @@ public class NoticeServiceImpl extends BaseServiceImpl params.put("createdBy",SecurityUser.getUserId()); List dtos = baseDao.selectListOfNoticeDTO(params); for (NoticeDTO dto : dtos) { - if (NumConstant.ZERO_STR.equals(dto.getNoticeReleaseState())) { - dto.setNoticeReleaseState("否"); - } else { - dto.setNoticeReleaseState("是"); + if (StringUtils.isNotEmpty(dto.getNoticeContent())) { + // 过滤 html 标签 + // 删除普通标签 + dto.setNoticeContent(dto.getNoticeContent().replaceAll("<(S*?)[^>]*>.*?|<.*? />", "")); + // 删除转义字符 + dto.setNoticeContent(dto.getNoticeContent().replaceAll("&.{2,6}?;", "")); } } + return dtos; } }