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 subtitles = Collections.emptyList(); + Optional 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 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