From a508775d5c69e61e605c8f00fc18e70279444869 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 21:49:04 +0800
Subject: [PATCH] add companyCode
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 97 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 49 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 a375da5..ff8221c 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
@@ -79,66 +79,65 @@
ColumnEntity columnEntity = columnMapper.selectById(id);
Map<String, Object> map = buildColumnData(columnEntity);
- map.put("releaseType", type);
executor.execute(() -> {
+ 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());
+ }
+ }
+ }
+
+ map.put("id", columnEntity.getId());
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);
+ releaseIndex(companyId);
});
-// if (type != 1) {
-// executor.execute(() -> {
-// if (columnEntity.getParentId() == 0L) {
-// List<ColumnEntity> columns = columnMapper.selectColumnByParentId(columnEntity.getId(), companyId, 2);
-// if (CollUtil.isNotEmpty(columns)) {
-// for (ColumnEntity column : columns) {
-// Map<String, Object> data = buildColumnData(column);
-// cmsCoreService.columnProcess(data, column.getListTemplate());
-//
-// 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());
-// }
-// }
-// }
-// }
-// }
-// }
-//
-// 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());
-// }
-// }
-// }
-//
-// releaseIndex(companyId);
-// });
-//
-// }
+ if (type != 1) {
+ executor.execute(() -> {
+ if (columnEntity.getParentId() == 0L) {
+ List<ColumnEntity> columns = columnMapper.selectColumnByParentId(columnEntity.getId(), companyId, 2);
+ if (CollUtil.isNotEmpty(columns)) {
+ for (ColumnEntity column : columns) {
+ 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());
+ }
+ }
+ }
+
+ Map<String, Object> data = buildColumnData(column);
+ cmsCoreService.columnProcess(data, column.getListTemplate());
+ }
+ }
+ }
+
+ releaseIndex(companyId);
+ });
+
+ }
}
@Override
--
Gitblit v1.9.1