From cf578e2af091815de3dcbc90b1c54706f633fc2b Mon Sep 17 00:00:00 2001
From: luofu <luofu@axzo.cn>
Date: Sat, 18 Nov 2023 15:36:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-1507):=20=E5=BE=85=E5=8A=9E=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=80=BC=E6=96=B0=E5=A2=9E=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
---
 .../msg/center/message/domain/dto/PendingMessageDTO.java    | 6 ++++++
 .../message/service/impl/MessageTemplateNewServiceImpl.java | 2 +-
 .../service/pending/response/PendingMessageResponse.java    | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
index 4009d8cf..21207a04 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
@@ -41,6 +41,10 @@ public class PendingMessageDTO implements Serializable {
      * 消息的唯一标识
      */
     private String identityCode;
+    /**
+     * 模板编码
+     */
+    private String templateCode;
     /**
      * 消息标题
      */
@@ -135,6 +139,7 @@ public class PendingMessageDTO implements Serializable {
                 .build();
         return PendingMessageDTO.builder()
                 .identityCode(pendingMessageRecord.getIdentityCode())
+                .templateCode(pendingMessageRecord.getTemplateCode())
                 .title(pendingMessageRecord.getTitle())
                 .content(pendingMessageRecord.getContent())
                 .promoter(promoter)
@@ -156,6 +161,7 @@ public class PendingMessageDTO implements Serializable {
     public PendingMessageResponse toResponse(TerminalTypeEnum terminalType) {
         return PendingMessageResponse.builder()
                 .identityCode(this.identityCode)
+                .templateCode(this.templateCode)
                 .title(this.title)
                 .content(this.content)
                 .cardItems(this.cardItems)
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
index 126cb240..c0e93282 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
@@ -238,7 +238,7 @@ public class MessageTemplateNewServiceImpl implements MessageTemplateNewService
             return Collections.emptyList();
         }
         return messageBaseTemplateDao.lambdaQuery()
-                .in(MessageBaseTemplate::getIsDelete, ids)
+                .in(MessageBaseTemplate::getId, ids)
                 .select(MessageBaseTemplate::getCode)
                 .list().stream()
                 .map(MessageBaseTemplate::getCode)
diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
index 7cf8bd0a..54b23ebc 100644
--- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
+++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
@@ -35,6 +35,10 @@ public class PendingMessageResponse implements Serializable {
      * 消息的唯一标识
      */
     private String identityCode;
+    /**
+     * 模板编码
+     */
+    private String templateCode;
     /**
      * 消息标题
      */