diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
index fc2a1034..126cb240 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
@@ -313,20 +313,18 @@ public class MessageTemplateNewServiceImpl implements MessageTemplateNewService
                 .set(MessageBaseTemplate::getUpdaterId, param.getOperatorId())
                 .set(StringUtils.isNotBlank(param.getTemplateName()), MessageBaseTemplate::getName,
                         param.getTemplateName())
-                .set(CollectionUtils.isNotEmpty(param.getPushTerminals()), MessageBaseTemplate::getPushTerminal,
-                        JSON.toJSONString(param.getPushTerminals()))
+                .set(MessageBaseTemplate::getPushTerminal, JSON.toJSONString(param.getPushTerminals()))
                 .set(StringUtils.isNotBlank(param.getTitle()), MessageBaseTemplate::getTitle, param.getTitle())
-                .set(CollectionUtils.isNotEmpty(param.getMsgCardContentItems()), MessageBaseTemplate::getCardContent,
-                        JSONObjectUtil.toJSONString(param.getMsgCardContentItems()))
-                .set(StringUtils.isNotBlank(param.getContent()), MessageBaseTemplate::getContent, param.getContent())
-                .set(StringUtils.isNotBlank(param.getIcon()), MessageBaseTemplate::getIcon, param.getIcon())
-                .set(StringUtils.isNotBlank(param.getMinAppVersion()), MessageBaseTemplate::getMinAppVersion,
-                        param.getMinAppVersion())
+                .set(MessageBaseTemplate::getCardContent, JSONObjectUtil.toJSONString(param.getMsgCardContentItems()))
+                .set(MessageBaseTemplate::getContent, param.getContent())
+                .set(MessageBaseTemplate::getIcon, param.getIcon())
+                .set(MessageBaseTemplate::getMinAppVersion, param.getMinAppVersion())
                 .update();
     }
 
     private void updateTemplateGroupRelation(MessageTemplateSaveOrUpdateParam param) {
         if (CollectionUtils.isEmpty(param.getLeafGroupNodes())) {
+            messageTemplateGroupService.deleteTemplateGroup(param.getTemplateCode());
             return;
         }
         messageTemplateGroupService.updateTemplateGroup(param.getTemplateCode(), param.getLeafGroupNodes());
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java
index d8735e86..fdec02b1 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java
@@ -67,14 +67,18 @@ public class MessageTemplateRouterServiceImpl implements MessageTemplateRouterSe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveOrUpdate(MessageTemplateRouterDTO router, boolean isUpdate) {
-        if (Objects.isNull(router) || router.isInValid()) {
-            log.info("invalid message template router. router:{}", router);
+        if (Objects.isNull(router)) {
+            log.info("template router is null.");
             return;
         }
         if (isUpdate) {
             // 更新的逻辑为删除旧的重新创建
             remove(router.fetchTemplateCode().orElse(null));
         }
+        if (!router.isValid()) {
+            log.info("invalid message template router.");
+            return;
+        }
         saveDetailRouter(router.getRouteDetail());
         batchSaveButtonRouter(router.getRouteButtons());
     }