diff --git a/src/main/java/neatlogic/framework/dao/cache/NeatLogicConcurrentSafeCache.java b/src/main/java/neatlogic/framework/dao/cache/NeatLogicConcurrentSafeCache.java
index 270679736d215d5e23ff83dfe4708c7a22705d9f..84f311e2ba75c425d613a0ae2427a1d5445f2b76 100644
--- a/src/main/java/neatlogic/framework/dao/cache/NeatLogicConcurrentSafeCache.java
+++ b/src/main/java/neatlogic/framework/dao/cache/NeatLogicConcurrentSafeCache.java
@@ -141,8 +141,8 @@ public class NeatLogicConcurrentSafeCache implements Cache {
             }
             if (flag) {
                 if (obj != null) {
-                    if (LOCAL_LOCK_MAP.containsValue(lock)) {
-                        logger.error("NeatLogicConcurrentSafeCache.LOCAL_LOCK_MAP中的锁对象没有被正常移除");
+                    if (LOCAL_LOCK_MAP.get(lockKey) == lock) {
+                        logger.error("NeatLogicConcurrentSafeCache.LOCAL_LOCK_MAP中的锁对象没有被正常移除，lockKey = " + lockKey);
                     }
                     // 获取到锁后，从缓存中得到的结果不为null，不会再查询数据库，也不会调用putObject方法，所以要在这里释放该锁
                     lock.unlock();
@@ -157,6 +157,8 @@ public class NeatLogicConcurrentSafeCache implements Cache {
                         lock.unlock();
                     }
                 }
+            } else {
+                logger.error("NeatLogicConcurrentSafeCache 获取锁超时 lockKey = " + lockKey);
             }
         }
         return obj;
diff --git a/src/main/java/neatlogic/framework/message/dao/mapper/MessageMapper.xml b/src/main/java/neatlogic/framework/message/dao/mapper/MessageMapper.xml
index 0ed00da6cd91befbf11ec34f12c00c351ac7ecfc..1ad914f860ad4d3b555368d517c54d041ec0152e 100755
--- a/src/main/java/neatlogic/framework/message/dao/mapper/MessageMapper.xml
+++ b/src/main/java/neatlogic/framework/message/dao/mapper/MessageMapper.xml
@@ -2,6 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="neatlogic.framework.message.dao.mapper.MessageMapper">
 
+    <cache type="neatlogic.framework.dao.cache.NeatLogicConcurrentSafeCache" flushInterval="60000" size="1000"/>
+
     <select id="getMessageSubscribeListByUserUuid" parameterType="java.lang.String"
             resultType="neatlogic.framework.message.dto.MessageHandlerVo">
         SELECT `handler`,
diff --git a/src/main/java/neatlogic/framework/message/dto/MessageHandlerVo.java b/src/main/java/neatlogic/framework/message/dto/MessageHandlerVo.java
index 09d64ff8a34fdf363b56f369d8c6a16e626fda43..ccda99166bf5a7ff55fc93a96526d0eb4090ff33 100755
--- a/src/main/java/neatlogic/framework/message/dto/MessageHandlerVo.java
+++ b/src/main/java/neatlogic/framework/message/dto/MessageHandlerVo.java
@@ -4,6 +4,7 @@ import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.restful.annotation.EntityField;
 import com.alibaba.fastjson.annotation.JSONField;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -13,7 +14,9 @@ import java.util.Date;
  * @Author: linbq
  * @Date: 2020/12/30 18:33
  **/
-public class MessageHandlerVo implements Cloneable {
+public class MessageHandlerVo implements Cloneable, Serializable {
+    private static final long serialVersionUID = 2910089979265665038L;
+
     @EntityField(name = "模块id", type = ApiParamType.STRING)
     private String moduleId;
     @EntityField(name = "模块名", type = ApiParamType.STRING)
diff --git a/src/main/java/neatlogic/framework/message/dto/MessageVo.java b/src/main/java/neatlogic/framework/message/dto/MessageVo.java
index d69da8d602e08ef8a9b78b94772015a6e29f1b3c..b12e4b2c55ee8a44afb69ab808e2ebfb18a15956 100755
--- a/src/main/java/neatlogic/framework/message/dto/MessageVo.java
+++ b/src/main/java/neatlogic/framework/message/dto/MessageVo.java
@@ -4,8 +4,8 @@ import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.notify.dto.NotifyVo;
 import neatlogic.framework.restful.annotation.EntityField;
 import neatlogic.framework.util.SnowflakeUtil;
-import com.alibaba.fastjson.annotation.JSONField;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -15,7 +15,9 @@ import java.util.Date;
  * @Author: linbq
  * @Date: 2020/12/30 15:13
  **/
-public class MessageVo {
+public class MessageVo implements Serializable {
+
+    private static final long serialVersionUID = 2910089979265665039L;
     @EntityField(name = "消息id", type = ApiParamType.LONG)
     private Long id;
     @EntityField(name = "标题", type = ApiParamType.STRING)
diff --git a/src/main/java/neatlogic/framework/message/dto/TriggerMessageCountVo.java b/src/main/java/neatlogic/framework/message/dto/TriggerMessageCountVo.java
index 4a49532e0691f159e6c217de33a5aca4327d3b88..38fc652c43a6d524fffc4bce25bdcc01685ceee5 100755
--- a/src/main/java/neatlogic/framework/message/dto/TriggerMessageCountVo.java
+++ b/src/main/java/neatlogic/framework/message/dto/TriggerMessageCountVo.java
@@ -1,5 +1,7 @@
 package neatlogic.framework.message.dto;
 
+import java.io.Serializable;
+
 /**
  * @Title: TriggerMessageCountVo
  * @Package neatlogic.framework.message.dto
@@ -8,7 +10,9 @@ package neatlogic.framework.message.dto;
  * @Date: 2021/2/22 18:46
 
  **/
-public class TriggerMessageCountVo {
+public class TriggerMessageCountVo implements Serializable {
+
+    private static final long serialVersionUID = 2910089979265665037L;
     private String notifyPolicyHandler;
     private String trigger;
     private Integer count;
diff --git a/src/main/java/neatlogic/framework/systemnotice/dao/mapper/SystemNoticeMapper.java b/src/main/java/neatlogic/framework/systemnotice/dao/mapper/SystemNoticeMapper.java
index d816545295c31c760eb0c72c364150c5dad7bf9e..fe505860cdb4bc4d1116d9754dc62b08e439679f 100755
--- a/src/main/java/neatlogic/framework/systemnotice/dao/mapper/SystemNoticeMapper.java
+++ b/src/main/java/neatlogic/framework/systemnotice/dao/mapper/SystemNoticeMapper.java
@@ -32,7 +32,7 @@ public interface SystemNoticeMapper {
 
     public List<SystemNoticeRecipientVo> getRecipientListByNoticeId(Long id);
 
-    public List<Long> getIssuedNoticeIdListByRecipientUuidList(List<String> uuidList);
+    public List<Long> getIssuedNoticeIdListByUserUuidAndRecipientUuidList(@Param("userUuid") String userUuid, @Param("recipientUuidList") List<String> recipientUuidList);
 
     public int searchIssuedNoticeCountByUserUuid(@Param("userUuid") String userUuid,@Param("noticeVo") SystemNoticeVo noticeVo);
 
diff --git a/src/main/java/neatlogic/framework/systemnotice/dao/mapper/SystemNoticeMapper.xml b/src/main/java/neatlogic/framework/systemnotice/dao/mapper/SystemNoticeMapper.xml
index c35eca87f578a9b199d61eb635ca447de9c3dc19..793204afa4b1d6b786403b23911cc021314a2473 100755
--- a/src/main/java/neatlogic/framework/systemnotice/dao/mapper/SystemNoticeMapper.xml
+++ b/src/main/java/neatlogic/framework/systemnotice/dao/mapper/SystemNoticeMapper.xml
@@ -2,6 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="neatlogic.framework.systemnotice.dao.mapper.SystemNoticeMapper">
 
+    <cache type="neatlogic.framework.dao.cache.NeatLogicConcurrentSafeCache" flushInterval="60000" size="1000"/>
+
     <select id="getSystemNoticeBaseInfoById" parameterType="java.lang.Long" resultType="neatlogic.framework.systemnotice.dto.SystemNoticeVo">
         select
         `id`,
@@ -132,7 +134,7 @@
         where `system_notice_id` = #{value}
     </select>
 
-    <select id="getIssuedNoticeIdListByRecipientUuidList" parameterType="java.util.List" resultType="java.lang.Long">
+    <select id="getIssuedNoticeIdListByUserUuidAndRecipientUuidList" parameterType="java.util.List" resultType="java.lang.Long">
         select
         distinct a.`id`
         from
@@ -141,8 +143,9 @@
         on a.`id` = b.`system_notice_id`
         where
         a.`status` = 'issued'
+        AND a.`id` NOT IN (SELECT `system_notice_id` FROM `system_notice_user` WHERE `user_uuid` = #{userUuid})
         and b.`uuid` in
-        <foreach collection="list" item="item" open="(" close=")" separator=",">
+        <foreach collection="recipientUuidList" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
     </select>
diff --git a/src/main/java/neatlogic/framework/systemnotice/dto/SystemNoticeRecipientVo.java b/src/main/java/neatlogic/framework/systemnotice/dto/SystemNoticeRecipientVo.java
index 8ce137470578db821282daf56ce18a0d3d2b8eaf..3061c46969a27cf36a29ab389788a42d34393c49 100755
--- a/src/main/java/neatlogic/framework/systemnotice/dto/SystemNoticeRecipientVo.java
+++ b/src/main/java/neatlogic/framework/systemnotice/dto/SystemNoticeRecipientVo.java
@@ -3,6 +3,8 @@ package neatlogic.framework.systemnotice.dto;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.restful.annotation.EntityField;
 
+import java.io.Serializable;
+
 /**
  * @Title: SystemNoticeRecipientVo
  * @Package: neatlogic.framework.systemnotice.dto
@@ -10,7 +12,8 @@ import neatlogic.framework.restful.annotation.EntityField;
  * @Author: laiwt
  * @Date: 2021/1/13 17:40
  **/
-public class SystemNoticeRecipientVo{
+public class SystemNoticeRecipientVo implements Serializable {
+    private static final long serialVersionUID = 2910089979265665036L;
     @EntityField(name = "公告id", type = ApiParamType.LONG)
     private Long systemNoticeId;
     @EntityField(name = "通知对象uuid", type = ApiParamType.STRING)
diff --git a/src/main/java/neatlogic/module/framework/systemnotice/service/SystemNoticeServiceImpl.java b/src/main/java/neatlogic/module/framework/systemnotice/service/SystemNoticeServiceImpl.java
index 239f132ed0b044aa18532711ee4229a2d6268a3a..3241d27858ebe6f49d0295ecc8413c573f3e9cf4 100644
--- a/src/main/java/neatlogic/module/framework/systemnotice/service/SystemNoticeServiceImpl.java
+++ b/src/main/java/neatlogic/module/framework/systemnotice/service/SystemNoticeServiceImpl.java
@@ -104,20 +104,21 @@ public class SystemNoticeServiceImpl implements SystemNoticeService, ISystemNoti
 
     @Override
     public void pullIssuedSystemNotice() {
-//        List<String> recipientUuidList = getRecipientUuidList();
-//        List<Long> issuedNoticeList = systemNoticeMapper.getIssuedNoticeIdListByRecipientUuidList(recipientUuidList);
-//        if (CollectionUtils.isNotEmpty(issuedNoticeList)) {
-//            List<SystemNoticeUserVo> noticeUserVoList = new ArrayList<>();
-//            for (Long id : issuedNoticeList) {
-//                noticeUserVoList.add(new SystemNoticeUserVo(id, UserContext.get().getUserUuid(true)));
-//            }
-//            systemNoticeMapper.batchInsertSystemNoticeUser(noticeUserVoList);
-//        }
-        String userUuid = UserContext.get().getUserUuid();
-        List<String> uuidList = UserContext.get().getUuidList();
-        uuidList.add(userUuid);
-        uuidList.add(UserType.ALL.getValue());
-        systemNoticeMapper.insertInsertSystemNoticeUser(userUuid, uuidList);
+        String userUuid = UserContext.get().getUserUuid(true);
+        List<String> recipientUuidList = getRecipientUuidList();
+        List<Long> issuedNoticeList = systemNoticeMapper.getIssuedNoticeIdListByUserUuidAndRecipientUuidList(userUuid, recipientUuidList);
+        if (CollectionUtils.isNotEmpty(issuedNoticeList)) {
+            List<SystemNoticeUserVo> noticeUserVoList = new ArrayList<>();
+            for (Long id : issuedNoticeList) {
+                noticeUserVoList.add(new SystemNoticeUserVo(id, userUuid));
+            }
+            systemNoticeMapper.batchInsertSystemNoticeUser(noticeUserVoList);
+        }
+//        String userUuid = UserContext.get().getUserUuid();
+//        List<String> uuidList = UserContext.get().getUuidList();
+//        uuidList.add(userUuid);
+//        uuidList.add(UserType.ALL.getValue());
+//        systemNoticeMapper.insertInsertSystemNoticeUser(userUuid, uuidList);
     }
 
     @Override
@@ -237,11 +238,11 @@ public class SystemNoticeServiceImpl implements SystemNoticeService, ISystemNoti
     }
 
     private List<String> getRecipientUuidList() {
-        List<String> uuidList = new ArrayList<>();
-        uuidList.add(UserContext.get().getUserUuid(true));
+        List<String> uuidList = UserContext.get().getUuidList();
+//        uuidList.add(UserContext.get().getUserUuid(true));
         uuidList.add(UserType.ALL.getValue());
-        uuidList.addAll(teamMapper.getTeamUuidListByUserUuid(UserContext.get().getUserUuid(true)));
-        uuidList.addAll(roleMapper.getRoleUuidListByUserUuid(UserContext.get().getUserUuid(true)));
+//        uuidList.addAll(teamMapper.getTeamUuidListByUserUuid(UserContext.get().getUserUuid(true)));
+//        uuidList.addAll(roleMapper.getRoleUuidListByUserUuid(UserContext.get().getUserUuid(true)));
         return uuidList;
     }
 }