wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-3045' into dev

Browse Source
This commit is contained in:
yanglin 2024-10-22 15:50:31 +08:00
commit 9cc79e94ef
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
View File

@ -120,7 +120,7 @@ public class TodoRangeQueryService {
ArrayList<ParsedKV> 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() {

5
msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/ButtonRouterDTO.java
View File

@ -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<ButtonStyleEnum> determineStyles() {
return style == null ? Collections.emptyList() : style;
}
@Override
public String toString() {
return JSON.toJSONString(this);