From 885e0a453347479d8fd9c3ea41747ffc28d51a5b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 07 Aug 2022 18:19:39 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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..5e0a9f0 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;
@@ -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());
                 }
             }
         }
@@ -210,8 +213,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