From a62596b736d8a6c53aefbf47e3938f0c835e7305 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Aug 2022 14:20:21 +0800
Subject: [PATCH] fix

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

--
Gitblit v1.9.1