diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysNotice.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysNotice.java index 927dfa1..e897b2d 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysNotice.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysNotice.java @@ -29,6 +29,8 @@ public class SysNotice extends BaseEntity /** 公告内容 */ private String noticeContent; + private String noticeContentNoHtml; + /** 公告状态(0正常 1关闭) */ private String status; @@ -75,6 +77,14 @@ public class SysNotice extends BaseEntity return noticeContent; } + public String getNoticeContentNoHtml() { + return noticeContentNoHtml; + } + + public void setNoticeContentNoHtml(String noticeContentNoHtml) { + this.noticeContentNoHtml = noticeContentNoHtml; + } + public void setStatus(String status) { this.status = status; diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysNoticeServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysNoticeServiceImpl.java index 9a29484..432b56c 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysNoticeServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysNoticeServiceImpl.java @@ -40,7 +40,9 @@ public class SysNoticeServiceImpl implements ISysNoticeService @Override public List selectNoticeList(SysNotice notice) { - return noticeMapper.selectNoticeList(notice); + List list = noticeMapper.selectNoticeList(notice); + list.stream().forEach(o -> o.setNoticeContentNoHtml(o.getNoticeContent().replaceAll("(?s)<[^>]*>(\\s*<[^>]*>)*", ""))); + return list; } /**