From 3284eb81a736c1cf3e78d92ecb690d47e5d7e7e6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Aug 2022 15:42:29 +0800
Subject: [PATCH] Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
index cc7d003..f31cef4 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.modules.system.service.Impl;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil;
import com.xcong.farmer.cms.common.utils.FileUtils;
@@ -76,7 +77,7 @@
releaseColumn(column.getParentId(), 1, companyId);
}
- if (beforeColumnId != null && !article.getColumnId().equals(beforeColumnId)) {
+ if (beforeColumnId != -1 && !article.getColumnId().equals(beforeColumnId)) {
ColumnEntity beforeColumn = columnMapper.selectById(beforeColumnId);
this.releaseColumn(beforeColumnId, 1, companyId);
if (beforeColumn.getParentId() != 0L) {
@@ -124,8 +125,10 @@
}
if (article.getType() == 1) {
- map.put("id", article.getId());
- cmsCoreService.articleProcess(map, columnEntity.getArticleTemplate(), columnEntity.getPath());
+ Map<String, Object> articleMap = new HashMap<>();
+ BeanUtil.copyProperties(map, articleMap);
+ articleMap.put("id", article.getId());
+ cmsCoreService.articleProcess(articleMap, columnEntity.getArticleTemplate(), columnEntity.getPath());
}
}
}
@@ -156,8 +159,10 @@
}
if (article.getType() == 1) {
- map.put("id", article.getId());
- cmsCoreService.articleProcess(map, column.getArticleTemplate(), column.getPath());
+ Map<String, Object> articleMap = new HashMap<>();
+ BeanUtil.copyProperties(map, articleMap);
+ articleMap.put("id", article.getId());
+ cmsCoreService.articleProcess(articleMap, column.getArticleTemplate(), column.getPath());
}
}
}
@@ -210,8 +215,14 @@
cmsCoreService.indexProcess(map, webSetting.getIndexTemplate());
if (hasSearch) {
- cmsCoreService.process(map, "search", webSetting.getSearchTemplate());
- cmsCoreService.process(map, "message", webSetting.getMsgTemplate());
+ Map<String, Object> search = new HashMap<>();
+ search.put("companyId", companyId);
+
+ Map<String, Object> message = new HashMap<>();
+ message.put("companyId", companyId);
+
+ cmsCoreService.process(search, "search", webSetting.getSearchTemplate());
+ cmsCoreService.process(message, "message", webSetting.getMsgTemplate());
}
}
--
Gitblit v1.9.1