fix

Helius

2022-07-11 0ecfecd2b85b71884fcfba8fa6849be963e434fd

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java

@@ -46,6 +46,10 @@
        ArticleEntity article = articleMapper.selectById(id);
        ColumnEntity column = columnMapper.selectById(article.getColumnId());

        Long beforeColumnId = article.getBeforeColumnId();
        article.setBeforeColumnId(-1L);
        articleMapper.updateById(article);

        Map<String, Object> data = new Hashtable<>();
        data.put("id", article.getId());
        data.put("companyId", companyId);
@@ -57,6 +61,15 @@
            if (column.getParentId() != 0L) {
                releaseColumn(column.getParentId(), 1, companyId);
            }

            if (beforeColumnId != null && !article.getColumnId().equals(beforeColumnId)) {
                ColumnEntity beforeColumn = columnMapper.selectById(beforeColumnId);
                this.releaseColumn(beforeColumnId, 1, companyId);
                if (beforeColumn.getParentId() != 0L) {
                    this.releaseColumn(beforeColumn.getParentId(), 1, companyId);
                }
            }

            this.releaseIndex(companyId);
        });
    }
@@ -66,40 +79,66 @@
        ColumnEntity columnEntity = columnMapper.selectById(id);
        Map<String, Object> map = buildColumnData(columnEntity);

        map.put("releaseType", type);
        executor.execute(() -> {
            cmsCoreService.columnProcess(map, columnEntity.getListTemplate());
            releaseIndex(companyId);
            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);
        });

        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<Long> ids = articleMapper.selectArticleIdsByColumnId(column.getId(), companyId,type);
                            cmsCoreService.articlesProcess(data, ids, column.getArticleTemplate(), column.getPath());
                        }
                    }
                }

                List<ArticleEntity> articles = articleMapper.selectArticleByColumnId(columnEntity.getId(), companyId, type);
                if (CollUtil.isNotEmpty(articles)) {
                    for (ArticleEntity article : articles) {
                        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