From 2e6277a8cf7a1d78b5151ac42f1aa785205cc907 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 14:18:52 +0800
Subject: [PATCH] finish index

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 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 09059c8..6a2ce1d 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
@@ -1,5 +1,6 @@
 package com.xcong.farmer.cms.modules.system.service.Impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -61,7 +62,17 @@
         }
         Integer contentType = adminArticleDto.getContentType() == null ? 0 : adminArticleDto.getContentType();
         if(contentType != 0){
-            articleEntity.setContentType(adminArticleDto.getContentType());
+            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);
@@ -247,13 +258,5 @@
         articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
         this.baseMapper.updateById(articleEntity);
         return Result.ok("操作成功");
-    }
-
-    @Override
-    public void releaseArticle(Long id) {
-        ArticleEntity article = this.baseMapper.selectById(id);
-
-        ColumnEntity column = columnMapper.selectById(article.getColumnId());
-        cmsCoreService.articleProcess(article.getId(), column.getArticleTemplate());
     }
 }

--
Gitblit v1.9.1