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 3602d11..3ddeef2 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 @@ -10,7 +10,7 @@ import com.bonus.system.service.ISysNoticeService; /** * 公告 服务层实现 - * + * * @author bonus */ @Service @@ -23,7 +23,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService /** * 查询公告信息 - * + * * @param noticeId 公告ID * @return 公告信息 */ @@ -37,7 +37,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService /** * 查询公告列表 - * + * * @param notice 公告信息 * @return 公告集合 */ @@ -45,13 +45,17 @@ public class SysNoticeServiceImpl implements ISysNoticeService public List selectNoticeList(SysNotice notice) { List list = noticeMapper.selectNoticeList(notice); - list.stream().forEach(o -> o.setNoticeContentNoHtml(o.getNoticeContent().replaceAll(HTML_REGEX, ""))); + list.forEach(o -> { + String content = o.getNoticeContent(); + o.setNoticeContentNoHtml(content != null ? content.replaceAll(HTML_REGEX, "") : ""); + }); return list; + } /** * 新增公告 - * + * * @param notice 公告信息 * @return 结果 */ @@ -63,7 +67,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService /** * 修改公告 - * + * * @param notice 公告信息 * @return 结果 */ @@ -75,7 +79,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService /** * 删除公告对象 - * + * * @param noticeId 公告ID * @return 结果 */ @@ -87,7 +91,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService /** * 批量删除公告信息 - * + * * @param noticeIds 需要删除的公告ID * @return 结果 */