修复分页死循环

wzy

2022-10-20 6a07f220e8f855740eee9b9dcae75464d6266380

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

@@ -131,7 +131,12 @@
        articleEntity.setArticleUrl(adminAddArticleDto.getArticleUrl());
        articleEntity.setType(adminAddArticleDto.getType());
        articleEntity.setContentType(adminAddArticleDto.getContentType());
        articleEntity.setDraftState(adminAddArticleDto.getDraftState());
        this.baseMapper.insert(articleEntity);

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

@@ -210,7 +215,12 @@

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

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

@@ -223,8 +233,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("删除成功");
@@ -311,6 +324,7 @@
        if(ObjectUtil.isEmpty(articleEntity)){
            return Result.fail("文章不存在");
        }
        articleEntity.setDraftState(2);
        articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
        this.baseMapper.updateById(articleEntity);