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 | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 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 87c1629..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 @@ -82,6 +82,14 @@ 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); }); @@ -94,7 +102,7 @@ Map<String, Object> data = buildColumnData(column); cmsCoreService.columnProcess(data, column.getListTemplate()); - List<ArticleEntity> articles = articleMapper.selectArticleByColumnId(columnEntity.getId(), companyId, type); + List<ArticleEntity> articles = articleMapper.selectArticleByColumnId(column.getId(), companyId, type); if (CollUtil.isNotEmpty(articles)) { for (ArticleEntity article : articles) { if (article.getReleaseStatus() == 0) { @@ -104,7 +112,7 @@ if (article.getType() == 1) { map.put("id", article.getId()); - cmsCoreService.articleProcess(map, columnEntity.getArticleTemplate(), columnEntity.getPath()); + cmsCoreService.articleProcess(map, column.getArticleTemplate(), column.getPath()); } } } -- Gitblit v1.9.1