From 7e6145c0904a36523ef08c3d802614535e1b31eb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Aug 2022 11:16:46 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java |    6 ++----
 1 files changed, 2 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..778210b 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
@@ -161,14 +161,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