diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java index 0a371191..b5e24a50 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java @@ -120,7 +120,7 @@ public class TodoRangeQueryService { ArrayList keyValues = new ArrayList<>(); for (PendingMessageResponse response : respResult.getList()) { response.getButtonRouters() - .removeIf(btn -> !btn.getStyle().contains(ButtonStyleEnum.OVER_CARD)); + .removeIf(btn -> !btn.determineStyles().contains(ButtonStyleEnum.OVER_CARD)); response.getModelV3().getButtons() .removeIf(btn -> !btn.parseStyle().contains(ButtonStyleEnum.OVER_CARD)); ParsedModel3Walker.walkDown(response.getModelV3(), new ParsedModel3Visitor() { diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/ButtonRouterDTO.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/ButtonRouterDTO.java index b962572c..a78a25cd 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/ButtonRouterDTO.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/ButtonRouterDTO.java @@ -14,6 +14,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import java.io.Serializable; +import java.util.Collections; import java.util.List; /** @@ -84,6 +85,10 @@ public class ButtonRouterDTO implements MessageButton, Serializable { */ private RouterButtonSourceEnum source; + public List determineStyles() { + return style == null ? Collections.emptyList() : style; + } + @Override public String toString() { return JSON.toJSONString(this);