Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

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)

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)

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;
     /**
      * 消息标题
      */