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

REQ-3045: fix npe

Browse Source
This commit is contained in:
yanglin 2024-10-12 14:45:54 +08:00
parent fedb4dd34b
commit 6072e594a6
4 changed files with 7 additions and 5 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/impl/MessageTemplateButtonV3ServiceImpl.java
View File

@ -47,7 +47,7 @@ public class MessageTemplateButtonV3ServiceImpl implements MessageTemplateButton
item.setUrlConfig(null);
}
if (item.getUrlConfig() != null) {
item.getUrlConfig().setFieldNullIfUrlAbsent();
item.getUrlConfig().setFieldsNullIfUrlAbsent();
}
return buttonV3;
}).collect(Collectors.toList());

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

@ -148,7 +148,7 @@ public class MessageTemplateGroupV3ServiceImpl implements MessageTemplateGroupV3
if (groupConfig != null
&& groupConfig.getDetail() != null
&& groupConfig.getDetail().getUrlConfig() != null) {
groupConfig.getDetail().getUrlConfig().setFieldNullIfUrlAbsent();
groupConfig.getDetail().getUrlConfig().setFieldsNullIfUrlAbsent();
}
return messageTemplateGroupV3;
}).collect(Collectors.toList());

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

@ -349,7 +349,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
if (Objects.nonNull(param.getCardJump().getCardUrlConfig())) {
template.setCardUrlConfig(param.getCardJump().getCardUrlConfig());
if (template.getCardUrlConfig().getUrlConfig() != null) {
template.getCardUrlConfig().getUrlConfig().setFieldNullIfUrlAbsent();
template.getCardUrlConfig().getUrlConfig().setFieldsNullIfUrlAbsent();
}
}
}

6
msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/parse/TerminalUrlParser.java
View File

@ -68,8 +68,10 @@ public class TerminalUrlParser {
if (mobileUrl == null)
return Collections.emptyList();
ArrayList<TerminalUrl> urls = new ArrayList<>();
urls.add(new TerminalUrl(TerminalTypeEnum.IOS, mobileUrl.getIos().getUrl()));
urls.add(new TerminalUrl(TerminalTypeEnum.ANDROID, mobileUrl.getAndroid().getUrl()));
if (mobileUrl.getIos() != null)
urls.add(new TerminalUrl(TerminalTypeEnum.IOS, mobileUrl.getIos().getUrl()));
if (mobileUrl.getAndroid() != null)
urls.add(new TerminalUrl(TerminalTypeEnum.ANDROID, mobileUrl.getAndroid().getUrl()));
return urls;
}