From da3b850b9c4a1a9a9e2c42e87415e34b8bead415 Mon Sep 17 00:00:00 2001
From: luofu <luofu@axzo.cn>
Date: Fri, 27 Oct 2023 17:01:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-1465):=20=E5=AD=90=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

修改：

1、子标题数据过滤

影响：
  无
---
 .../domain/vo/GeneralMessagePushVO.java        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/vo/GeneralMessagePushVO.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/vo/GeneralMessagePushVO.java
index 14369b77..5216d5b6 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/vo/GeneralMessagePushVO.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/vo/GeneralMessagePushVO.java
@@ -12,10 +12,12 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -95,13 +97,18 @@ public class GeneralMessagePushVO implements Serializable {
                 cardContentItems.stream()
                         .map(CardExtensionItem::from)
                         .collect(Collectors.toList());
+        List<Subtitle> subtitles = Collections.emptyList();
+        Optional<Subtitle> subtitleOp = Subtitle.from(record, orgIcon);
+        if (subtitleOp.isPresent()) {
+            subtitles = Lists.newArrayList(subtitleOp.get());
+        }
         return GeneralMessagePushVO.builder()
                 .identityCode(record.getIdentityCode())
                 .templateCode(record.getTemplateCode())
                 .cardBannerUrl(templateIcon)
                 .cardTitle(record.getTitle())
                 .cardDetailButton(cardDetailButton)
-                .subtitles(Lists.newArrayList(Subtitle.from(record, orgIcon)))
+                .subtitles(subtitles)
                 .cardContent(record.getContent())
                 .cardExtension(cardExtension)
                 .cardButtons(cardButtons)
@@ -131,11 +138,14 @@ public class GeneralMessagePushVO implements Serializable {
          */
         private String title;
 
-        static Subtitle from(GeneralMessageRecord record, String orgIcon) {
-            return Subtitle.builder()
+        static Optional<Subtitle> from(GeneralMessageRecord record, String orgIcon) {
+            if (StringUtils.isBlank(record.getOrgName())) {
+                return Optional.empty();
+            }
+            return Optional.of(Subtitle.builder()
                     .title(record.getOrgName())
                     .iconUrl(orgIcon)
-                    .build();
+                    .build());
         }
 
         @Override