From 0971b50cb94c9adaeba7becc180c18621b4d4059 Mon Sep 17 00:00:00 2001
From: zhangdaihao <zhangdaiscott@163.com>
Date: Tue, 21 May 2019 14:49:26 +0800
Subject: [PATCH] =?UTF-8?q?jeecgBoot=20v2.0=E7=89=88=E6=9C=AC=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tools/HeaderNotice.vue     | 25 +++++++++++--------
 .../system/mapper/SysAnnouncementMapper.java  |  3 ++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue b/ant-design-jeecg-vue/src/components/tools/HeaderNotice.vue
index 59a05ec0..debe676a 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 e38af04c..9c6f3cea 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<SysAnnouncement> {
 
 	
-	List<SysAnnouncement> querySysCementListByUserId(Page<SysAnnouncement> page, String userId,String msgCategory);
+	List<SysAnnouncement> querySysCementListByUserId(Page<SysAnnouncement> page, @Param("userId")String userId,@Param("msgCategory")String msgCategory);
 
 }
-- 
GitLab