Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-07 50a170ab1b38e97063e7a32da51e07b939638e8d

Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

 src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java

@@ -35,7 +35,7 @@
        data.put("templatePath", templatePath);
        data.put("templateName", data.get("id"));
        if (StrUtil.isEmpty(templateName)) {
            templateName = "defualt.artile.html";
            templateName = "defualt.article.html";
        }

        cfg.process(data, templateName);

 src/main/java/com/xcong/farmer/cms/modules/system/mapper/ArticleMapper.java

@@ -24,7 +24,7 @@

    IPage<ArticleEntity> selectArticleInPage(Page<ArticleEntity> page, @Param("record") ArticleEntity article);

    IPage<WebArticleVo> selectWebArticleInPage(Page<WebArticleVo> page, @Param("record")ArticleEntity articleEntity);
    IPage<WebArticleVo> selectWebArticleInPage(Page<WebArticleVo> page, @Param("record") ArticleEntity articleEntity);

    List<Long> selectArticleIdsByColumnId(@Param("columnId") Long columnId, @Param("companyId") Long companyId, @Param("type") Integer type);
}

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

@@ -50,6 +50,7 @@
        data.put("companyId", companyId);

        executor.execute(()->{
            log.info("执行文章发布");
            cmsCoreService.articleProcess(data, column.getArticleTemplate(), column.getPath());
            this.releaseColumn(column.getId(), 1);
            if (column.getParentId() != 0L) {