From d0a59ed31509cae72d96fab19ee0db696969fc04 Mon Sep 17 00:00:00 2001 From: yanglin Date: Tue, 22 Oct 2024 16:20:55 +0800 Subject: [PATCH] REQ-3046: fix bug --- .../center/message/service/todo/TodoRangeQueryService.java | 2 +- .../service/pending/response/v3/model/ParsedButtonV3.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 d581a155..2e7a546d 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 @@ -122,7 +122,7 @@ public class TodoRangeQueryService { response.getButtonRouters() .removeIf(btn -> !btn.determineStyles().contains(ButtonStyleEnum.OVER_CARD)); response.getModelV3().getButtons() - .removeIf(btn -> !btn.parseStyle().contains(ButtonStyleEnum.OVER_CARD)); + .removeIf(btn -> !btn.hasStyle(ButtonStyleEnum.OVER_CARD)); ParsedModel3Walker.walkDown(response.getModelV3(), new ParsedModel3Visitor() { @Override public void visitGroupKeyValue(ParsedGroupV3 group, ParsedKV kv) { diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedButtonV3.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedButtonV3.java index 72ecf4a2..3999fd18 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedButtonV3.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedButtonV3.java @@ -90,6 +90,10 @@ public class ParsedButtonV3 implements MessageButton { return JSON.parseArray(style.toJSONString(), ButtonStyleEnum.class); } + public boolean hasStyle(ButtonStyleEnum style) { + return parseStyle().contains(style); + } + @Override public String key() { return code;