diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageSendTwiceRecordServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageSendTwiceRecordServiceImpl.java
index 093dccdc..05c66a8a 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageSendTwiceRecordServiceImpl.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageSendTwiceRecordServiceImpl.java
@@ -1,6 +1,5 @@
 package cn.axzo.msg.center.message.service.impl;
 
-import cn.axzo.msg.center.common.enums.TableIsDeleteEnum;
 import cn.axzo.msg.center.dal.MessageSendTwiceRecordDao;
 import cn.axzo.msg.center.domain.entity.MessageSendTwiceRecord;
 import cn.axzo.msg.center.message.service.MessageSendTwiceRecordService;
@@ -34,10 +33,10 @@ public class MessageSendTwiceRecordServiceImpl implements MessageSendTwiceRecord
             log.info("personId is null.");
             return Collections.emptyList();
         }
-        // TODO:[cold_blade] [P2] 此处的代码仅做一个双发兜底的策略，后期应当全走新的消息发送流程
         return messageSendTwiceRecordDao.lambdaQuery()
                 .eq(MessageSendTwiceRecord::getReceiverPersonId, personId)
-                .eq(MessageSendTwiceRecord::getIsDelete, TableIsDeleteEnum.NORMAL.value)
+                .last("LIMIT 500")
+                .orderByDesc(MessageSendTwiceRecord::getId)
                 .select(MessageSendTwiceRecord::getOriginalMsgId)
                 .list().stream()
                 .map(MessageSendTwiceRecord::getOriginalMsgId)
diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageSendTwiceRecord.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageSendTwiceRecord.java
index 1fe2184c..1f2457f7 100644
--- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageSendTwiceRecord.java
+++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageSendTwiceRecord.java
@@ -1,6 +1,6 @@
 package cn.axzo.msg.center.domain.entity;
 
-import cn.axzo.msg.center.domain.persistence.BaseEntity;
+import cn.axzo.msg.center.domain.persistence.BaseEntityExt;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
@@ -16,7 +16,7 @@ import java.io.Serializable;
 @Setter
 @Getter
 @TableName("message_send_twice_record")
-public class MessageSendTwiceRecord extends BaseEntity<MessageSendTwiceRecord> implements Serializable {
+public class MessageSendTwiceRecord extends BaseEntityExt<MessageSendTwiceRecord> implements Serializable {
 
     private static final long serialVersionUID = 3517821492158061709L;