From 2762e01a72e93dc6703c06c701b28ceffe7c9de8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 07 Oct 2022 21:46:32 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
index 979c54a..71292cf 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
@@ -51,6 +51,7 @@
data.put("templatePath", templatePath);
data.put("templateName", data.get("id"));
globalData(data);
+
if (StrUtil.isEmpty(templateName)) {
templateName = "defualt.article.html";
}
@@ -161,14 +162,12 @@
if ("column".equals(type)){
Long id = (Long) data.get("id");
ColumnEntity columnEntity = columnMapper.selectById(id);
- data.put("title", columnEntity.getColumnName() + "_" + globalSetting.get("title"));
+ globalSetting.put("title", columnEntity.getColumnName() + "_" + globalSetting.get("title"));
} else if ("article".equals(type)) {
Long id = (Long) data.get("id");
ArticleEntity article = articleMapper.selectById(id);
ColumnEntity columnEntity = columnMapper.selectById(article.getColumnId());
- data.put("title", article.getTitle() + "_" + columnEntity.getColumnName() +"_" + globalSetting.get("title"));
- } else {
- data.put("title", globalSetting.get("title"));
+ globalSetting.put("title", article.getTitle() + "_" + columnEntity.getColumnName() +"_" + globalSetting.get("title"));
}
data.putAll(globalSetting);
--
Gitblit v1.9.1