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

Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

Browse Source
This commit is contained in:
luofu 2023-11-24 09:03:58 +08:00
commit 3c788cfa2a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,7 +385,6 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
.orElse(null); .orElse(null);
// 解析并替换掉路由地址中的动态参数变量 // 解析并替换掉路由地址中的动态参数变量
JSONObject routerParam = JSONObjectUtil.parseObject(pendingMessageRecord.getRouterParams()); JSONObject routerParam = JSONObjectUtil.parseObject(pendingMessageRecord.getRouterParams());
msgTemplateRouter = MessageRouterUtil.parseAndConcatRouteUrl(msgTemplateRouter, routerParam);
JSONObject authParam = new JSONObject(); JSONObject authParam = new JSONObject();
if (!routerParam.containsKey("ouId")) { if (!routerParam.containsKey("ouId")) {
authParam.put("ouId", pendingMessageRecord.getOuId()); authParam.put("ouId", pendingMessageRecord.getOuId());
@ -393,7 +392,9 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
if (!routerParam.containsKey("workspaceId")) { if (!routerParam.containsKey("workspaceId")) {
authParam.put("workspaceId", pendingMessageRecord.getOrgId()); authParam.put("workspaceId", pendingMessageRecord.getOrgId());
} }
authParam.putAll(routerParam);
msgTemplateRouter = MessageRouterUtil.parseRouteUrl(msgTemplateRouter, authParam); msgTemplateRouter = MessageRouterUtil.parseRouteUrl(msgTemplateRouter, authParam);
msgTemplateRouter = MessageRouterUtil.parseAndConcatRouteUrl(msgTemplateRouter, routerParam);
pendingMessage.setMsgTemplateRouter(msgTemplateRouter); pendingMessage.setMsgTemplateRouter(msgTemplateRouter);
// 获取模板卡片信息 // 获取模板卡片信息
List<MessageCardContentItemDTO> msgCardContentItems = messageTemplates.stream() List<MessageCardContentItemDTO> msgCardContentItems = messageTemplates.stream()