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:
xudawei 2024-10-08 23:51:00 +08:00
commit 2b9b5fccb3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java
View File

@ -342,7 +342,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
template.setCardUrlOpenStrategy(param.getCardJump().getCardUrlOpenStrategy());
}
if (Objects.nonNull(param.getCardJump().getCardUrlConfig())) {
template.setCardUrConfig(param.getCardJump().getCardUrlConfig());
template.setCardUrlConfig(param.getCardJump().getCardUrlConfig());
}
}
return template;
@ -359,6 +359,10 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
.set(StringUtils.isNotBlank(param.getTitle()), MessageTemplateV3::getTitle, param.getTitle())
// .set(MessageBaseTemplate::getCardContent, JSONObjectUtil.toJSONString(param.getMsgCardContentItems()))
.set(MessageTemplateV3::getContent, param.getContent())
.set(Objects.nonNull(param.getCardJump()) && Objects.nonNull(param.getCardJump().getCardUrlOpenStrategy())
,MessageTemplateV3::getCardUrlOpenStrategy,param.getCardJump().getCardUrlOpenStrategy())
.set(Objects.nonNull(param.getCardJump()) && Objects.nonNull(param.getCardJump().getCardUrlConfig())
,MessageTemplateV3::getCardUrlConfig, param.getCardJump().getCardUrlConfig())
.set(StringUtils.isNotBlank(param.getDetailStyleCode()),
MessageTemplateV3::getDetailStyleCode, param.getDetailStyleCode())
.set(MessageTemplateV3::getUpdatePersonId, param.getOperatorId())

2
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateV3.java
View File

@ -79,7 +79,7 @@ public class MessageTemplateV3 extends BaseEntityWithOperator<MessageTemplateV3>
* 卡片跳转配置. 在links的基础上再包一层, 避免以后卡片增加自己的配置
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private CardUrlConfig cardUrConfig;
private CardUrlConfig cardUrlConfig;
/**
* IM发送优先级