fix

Helius

2022-08-30 d39169d41038ed62d1f6a9b25513b247a1a8c02f

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

@@ -132,6 +132,10 @@
        articleEntity.setType(adminAddArticleDto.getType());
        articleEntity.setContentType(adminAddArticleDto.getContentType());
        this.baseMapper.insert(articleEntity);

        if (adminAddArticleDto.getSaveState() == 2) {
            releaseService.releaseArticle(articleEntity.getId(), articleEntity.getCompanyId());
        }
        return Result.ok("添加成功");
    }

@@ -182,7 +186,7 @@
            return Result.fail("请选择文章栏目");
        }

        if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() == null) {
        if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() == -1) {
            articleEntity.setBeforeColumnId(articleEntity.getColumnId());
        }
        articleEntity.setColumnId(columnId);
@@ -207,11 +211,14 @@
        articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
        articleEntity.setType(adminUpdateArticleDto.getType());
        articleEntity.setContentType(adminUpdateArticleDto.getContentType());
        articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);

        String authorBelong = adminUpdateArticleDto.getAuthorBelong();
        articleEntity.setAuthorBelong(authorBelong);
        this.baseMapper.updateById(articleEntity);

        if (adminUpdateArticleDto.getSaveState() == 2) {
            releaseService.releaseArticle(articleEntity.getId(), articleEntity.getCompanyId());
        }
        return Result.ok("更新成功");
    }

@@ -224,8 +231,11 @@
                Long articleId = Long.valueOf(articleIdStr);

                ArticleEntity articleEntity = this.baseMapper.selectById(articleId);
                articleEntity.setDelStatus(ArticleEntity.DELETE_STATUS_YES);
                this.baseMapper.updateById(articleEntity);
//                articleEntity.setDelStatus(ArticleEntity.DELETE_STATUS_YES);
//                this.baseMapper.updateById(articleEntity);
                if (articleEntity != null) {
                    this.baseMapper.deleteById(articleId);
                }
            }
        }
        return Result.ok("删除成功");
@@ -239,6 +249,8 @@
        }
        articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);
        this.baseMapper.updateById(articleEntity);

        releaseService.releaseColumn(articleEntity.getColumnId(), 2, articleEntity.getCompanyId());
        return Result.ok("操作成功");
    }

@@ -291,6 +303,15 @@
            articleEntity.setTimeType(timeType);
        }
        IPage<WebArticleVo> list = this.baseMapper.selectWebArticleInPage(page,articleEntity);

        if (CollUtil.isNotEmpty(list.getRecords())) {
            for (WebArticleVo record : list.getRecords()) {
                // 站内
                if (record.getType() == 1) {
                    record.setArticleUrl(record.getBaseUrl() + record.getPath() + "/" + record.getId() + ".html");
                }
            }
        }
        return Result.ok(list);
    }

@@ -302,7 +323,6 @@
            return Result.fail("文章不存在");
        }
        articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
        articleEntity.setBeforeColumnId(null);
        this.baseMapper.updateById(articleEntity);

        releaseService.releaseArticle(articleEntity.getId(), companyId);