From 9b51a62597487073b54aa27cdd059828ebfcb2ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 19:19:47 +0800
Subject: [PATCH] 加synchronized
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
index 4e8f2fc..5a88510 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
@@ -69,24 +69,19 @@
if(StrUtil.isNotEmpty(title)){
articleEntity.setTitle(title);
}
- Integer contentType = adminArticleDto.getContentType() == null ? 0 : adminArticleDto.getContentType();
- if(contentType != 0){
- QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("content_type",contentType);
- List<ColumnEntity> columnEntities = columnMapper.selectList(objectQueryWrapper);
- if(CollUtil.isNotEmpty(columnEntities)){
- List<Long> columIds = new ArrayList<>();
- for(ColumnEntity columnEntity : columnEntities){
- Long id = columnEntity.getId();
- columIds.add(id);
- }
- articleEntity.setColumnIds(columIds);
- }
- }
+
if(UserEntity.USER_BELONG_TOP != companyId){
articleEntity.setCompanyId(companyId);
}
IPage<AdminArticleVo> list = this.baseMapper.selectAdminArticleInPage(page,articleEntity);
+ if (CollUtil.isNotEmpty(list.getRecords())) {
+ for (AdminArticleVo record : list.getRecords()) {
+ // 站内
+ if (record.getType() == 1) {
+ record.setArticleUrl(record.getBaseUrl() + record.getPath() + "/" + record.getId() + ".html");
+ }
+ }
+ }
return Result.ok(list);
}
@@ -291,6 +286,7 @@
@Override
public Result updateStatusOn(Long id) {
+ Long companyId = LoginUserUtil.getCompanyId();
ArticleEntity articleEntity = this.baseMapper.selectById(id);
if(ObjectUtil.isEmpty(articleEntity)){
return Result.fail("文章不存在");
@@ -298,7 +294,7 @@
articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
this.baseMapper.updateById(articleEntity);
- releaseService.releaseArticle(articleEntity.getId());
+ releaseService.releaseArticle(articleEntity.getId(), companyId);
return Result.ok("操作成功");
}
--
Gitblit v1.9.1