From 7d917b206e43a5ee4cdb9e1458f3af10e5e586f3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 16:52:25 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 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 d0ca9e8..27ccd38 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
@@ -47,7 +47,7 @@
ColumnEntity column = columnMapper.selectById(article.getColumnId());
Long beforeColumnId = article.getBeforeColumnId();
- article.setBeforeColumnId(null);
+ article.setBeforeColumnId(-1L);
articleMapper.updateById(article);
Map<String, Object> data = new Hashtable<>();
@@ -79,8 +79,17 @@
ColumnEntity columnEntity = columnMapper.selectById(id);
Map<String, Object> map = buildColumnData(columnEntity);
+ map.put("releaseType", type);
executor.execute(() -> {
cmsCoreService.columnProcess(map, columnEntity.getListTemplate());
+ if (columnEntity.getParentId() != 0L) {
+ ColumnEntity parentColumn = columnMapper.selectById(columnEntity.getParentId());
+ Map<String, Object> parentMap = buildColumnData(parentColumn);
+ parentMap.put("id", parentColumn.getId());
+ parentMap.put("releaseType", type);
+ cmsCoreService.columnProcess(parentMap, parentColumn.getListTemplate());
+ }
+
releaseIndex(companyId);
});
@@ -93,8 +102,20 @@
Map<String, Object> data = buildColumnData(column);
cmsCoreService.columnProcess(data, column.getListTemplate());
- List<Long> ids = articleMapper.selectArticleIdsByColumnId(column.getId(), companyId,type);
- cmsCoreService.articlesProcess(data, ids, column.getArticleTemplate(), column.getPath());
+ List<ArticleEntity> articles = articleMapper.selectArticleByColumnId(column.getId(), companyId, type);
+ if (CollUtil.isNotEmpty(articles)) {
+ for (ArticleEntity article : articles) {
+ if (article.getReleaseStatus() == 0) {
+ article.setReleaseStatus(1);
+ articleMapper.updateById(article);
+ }
+
+ if (article.getType() == 1) {
+ map.put("id", article.getId());
+ cmsCoreService.articleProcess(map, column.getArticleTemplate(), column.getPath());
+ }
+ }
+ }
}
}
}
@@ -102,6 +123,11 @@
List<ArticleEntity> articles = articleMapper.selectArticleByColumnId(columnEntity.getId(), companyId, type);
if (CollUtil.isNotEmpty(articles)) {
for (ArticleEntity article : articles) {
+ if (article.getReleaseStatus() == 0) {
+ article.setReleaseStatus(1);
+ articleMapper.updateById(article);
+ }
+
if (article.getType() == 1) {
map.put("id", article.getId());
cmsCoreService.articleProcess(map, columnEntity.getArticleTemplate(), columnEntity.getPath());
--
Gitblit v1.9.1