diff --git a/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue b/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue index 59a05ec0d221b4d0dc711985f614dac318cb9bf7..debe676a88efbd456036a4705c11340af4566a5f 100644 --- a/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue +++ b/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue @@ -116,17 +116,20 @@ },60000) }, loadData (){ - // 获取系统消息 - getAction(this.url.listCementByUser).then((res)=>{ - if(res.success){ - this.announcement1 = res.result.anntMsgList; - this.msg1Count = res.result.anntMsgTotal; - this.msg1Title = "通知("+res.result.anntMsgTotal+")"; - this.announcement2 = res.result.sysMsgList; - this.msg2Count = res.result.sysMsgTotal; - this.msg2Title = "系统消息("+res.result.sysMsgTotal+")"; - } - }); + try { + // 获取系统消息 + getAction(this.url.listCementByUser).then((res) => { + if (res.success) { + this.announcement1 = res.result.anntMsgList; + this.msg1Count = res.result.anntMsgTotal; + this.msg1Title = "通知(" + res.result.anntMsgTotal + ")"; + this.announcement2 = res.result.sysMsgList; + this.msg2Count = res.result.sysMsgTotal; + this.msg2Title = "系统消息(" + res.result.sysMsgTotal + ")"; + } + }); + } catch (err) { + } }, fetchNotice () { if (this.loadding) { diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java index e38af04c152700422b035fabfc40797ca893c1bd..9c6f3ceadb93049ad6a5168171069fd45a901d25 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java @@ -2,6 +2,7 @@ package org.jeecg.modules.system.mapper; import java.util.List; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysAnnouncement; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,6 +17,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; public interface SysAnnouncementMapper extends BaseMapper { - List querySysCementListByUserId(Page page, String userId,String msgCategory); + List querySysCementListByUserId(Page page, @Param("userId")String userId,@Param("msgCategory")String msgCategory); }