From 907a259fc3ffa0ef51a3f87523785415a8f97208 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Aug 2022 11:39:35 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java | 9 +++++----
1 files changed, 5 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..7808c41 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,8 @@
data.put("templatePath", templatePath);
data.put("templateName", data.get("id"));
globalData(data);
+
+ log.info("========>{}", data.get("title"));
if (StrUtil.isEmpty(templateName)) {
templateName = "defualt.article.html";
}
@@ -161,16 +163,15 @@
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"));
}
+ log.info("========>>>>{}", globalSetting.get("title"));
data.putAll(globalSetting);
}
}
--
Gitblit v1.9.1