Merge branch 'feature/REQ-1507' into dev

inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateGroupServiceImpl.java

@@ -137,7 +137,6 @@ public class MessageTemplateGroupServiceImpl implements MessageTemplateGroupServ
         // 统计指定的模板编码关联的分类数量
         Map<String, Long> templateCodeList = messageTemplateGroupDao.lambdaQuery()
                 .in(MessageTemplateGroup::getTemplateCode, templateCodes)
-                .eq(MessageTemplateGroup::getPath, nodeCodePathMap.get(curGroupNodeCode))
                 .eq(MessageTemplateGroup::getIsDelete, TableIsDeleteEnum.NORMAL.value)
                 // 这里仅查询模板编码字段即可
                 .select(MessageTemplateGroup::getTemplateCode)

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

@@ -200,6 +200,7 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
         pendingMessageRecordDao.saveBatch(record);
         // TODO 消息推送 @luofu
         return record.stream().map(e -> PushPendingMessageDTO.builder()
+                .id(e.getId())
                 .executorId(e.getExecutorId())
                 .executorPersonId(e.getExecutorPersonId())
                 .requestNo(e.getRequestNo())

inside-notices/src/main/java/cn/axzo/msg/center/utils/MessageRouterUtil.java

@@ -154,7 +154,7 @@ public final class MessageRouterUtil {
     }
 
     private static void parseAndConcatButtonRouterUrl(List<MessageRouteButtonDTO> routeButtons, JSONObject routerParam) {
-        if (CollectionUtils.isNotEmpty(routeButtons)) {
+        if (CollectionUtils.isEmpty(routeButtons)) {
             return;
         }
         routeButtons.forEach(e -> {

msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PushPendingMessageDTO.java

@@ -14,6 +14,11 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class PushPendingMessageDTO {
+    /**
+     * 消息记录ID
+     */
+    private Long id;
+
     /**
      * 请求批次号
      */