From 6cd088b951eca087d303e383e9159f45f38bdb6a Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 11 Jul 2022 16:48:13 +0800 Subject: [PATCH] fix --- src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 94 +++++++++++++++++++++++----------------------- 1 files changed, 47 insertions(+), 47 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..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 @@ -90,55 +90,55 @@ 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) { + 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); + }); + + } } @Override -- Gitblit v1.9.1