fix

Helius

2022-07-11 249f6a8da667a1cfe019ce9c647492da9562dd1a

fix

 src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java

@@ -51,13 +51,6 @@
        }
        article.setCompanyId(companyId);

        Integer releaseType = (Integer) node.getSystemDataValue("releaseType");
        if (releaseType == null) {
            article.setReleaseType(2);
        } else {
            article.setReleaseType(releaseType);
        }

        IPage<ArticleEntity> listPage = articleMapper.selectArticleInPage(page, article);

        List<ArticleData> list = new ArrayList<>();

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

@@ -79,14 +79,28 @@
        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());
            }

@@ -99,9 +113,6 @@
                    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) {
@@ -116,21 +127,9 @@
                                    }
                                }
                            }
                        }
                    }
                }

                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<String, Object> data = buildColumnData(column);
                            cmsCoreService.columnProcess(data, column.getListTemplate());
                        }
                    }
                }

 src/main/resources/mapper/ArticleMapper.xml

@@ -79,7 +79,7 @@
        inner join t_column b on a.column_id=b.id
        inner join t_column c on b.parent_id=c.id or c.id=b.id
        <where>
            a.company_id=#{record.companyId} and a.del_status = 1
            a.company_id=#{record.companyId} and a.del_status = 1 and release_status = 1
            <if test="record.columnCode != null and record.columnCode != ''">
                and c.column_code=#{record.columnCode}
            </if>
@@ -88,9 +88,6 @@
                <foreach collection="record.columnIds" item="item" open="(" close=")" separator=",">
                    ${item}
                </foreach>
            </if>
            <if test="record.releaseType == 2">
                and release_status = 1
            </if>
        </where>
        order by release_time desc