From 2277d5705cffeefe909ff2d8ccba476b08093ad1 Mon Sep 17 00:00:00 2001 From: luofu Date: Thu, 23 Nov 2023 14:40:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-1507):=20=E8=B7=AF=E7=94=B1=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=8B=BC=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 背景： https://jira.axzo.cn/browse/REQ-1507?goToView=1 影响： 无 --- .../message/service/impl/PendingMessageNewServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java index c52d13c5..afa0e233 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java @@ -385,7 +385,6 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService { .orElse(null); // 解析并替换掉路由地址中的动态参数变量 JSONObject routerParam = JSONObjectUtil.parseObject(pendingMessageRecord.getRouterParams()); - msgTemplateRouter = MessageRouterUtil.parseAndConcatRouteUrl(msgTemplateRouter, routerParam); JSONObject authParam = new JSONObject(); if (!routerParam.containsKey("ouId")) { authParam.put("ouId", pendingMessageRecord.getOuId()); @@ -393,7 +392,9 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService { if (!routerParam.containsKey("workspaceId")) { authParam.put("workspaceId", pendingMessageRecord.getOrgId()); } + authParam.putAll(routerParam); msgTemplateRouter = MessageRouterUtil.parseRouteUrl(msgTemplateRouter, authParam); + msgTemplateRouter = MessageRouterUtil.parseAndConcatRouteUrl(msgTemplateRouter, routerParam); pendingMessage.setMsgTemplateRouter(msgTemplateRouter); // 获取模板卡片信息 List msgCardContentItems = messageTemplates.stream()