From 66584feb4f0726e6dee87bd7556ce369eca9712b Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Thu, 3 Apr 2025 20:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E7=B1=BB=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bst/article/mapper/ArticleMapper.java     |  2 +-
 .../bst/article/mapper/ArticleMapper.xml      |  3 +-
 .../bst/article/service/ArticleService.java   |  2 +
 .../service/impl/ArticleServiceImpl.java      |  7 ++-
 .../mapper/ArticleCategoryMapper.java         | 20 ++++----
 .../impl/ArticleCategoryServiceImpl.java      | 46 ++++++++++++-------
 .../web/bst/ArticleCategoryController.java    |  6 +--
 7 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java
index c93f16e..05ce669 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java
@@ -73,7 +73,7 @@ public interface ArticleMapper
      */
     public int deleteArticleByIds(Long[] ids);
 
-    public ArticleVO selectChildrenByiId(Long id);
+    public ArticleVO selectChildrenById(Long id);
 
     ArticleVO selectArticleByCode(ArticleCategoryQuery articleCategoryQuery);
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml
index 0234b45..eecb602 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml
@@ -47,10 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectChildrenByiId" resultType="com.ruoyi.bst.article.domain.ArticleVO">
+    <select id="selectChildrenById" resultType="com.ruoyi.bst.article.domain.ArticleVO">
         <include refid="selectArticleVo"/>
         where id = #{categoryId}
     </select>
+
     <select id="selectArticleByCode" resultType="com.ruoyi.bst.article.domain.ArticleVO">
         <include refid="selectArticleVo"/>
         where code = #{code}
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java
index 5f72883..71fa6e0 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java
@@ -65,4 +65,6 @@ public interface ArticleService
     ArticleVO selectChildrenByCategoryId(Long id);
 
     ArticleVO selectArticleByCode(ArticleCategoryQuery articleCategoryQuery);
+
+    ArticleVO selectArticleByCategoryId(Long id);
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java
index 92c32c6..c693abe 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java
@@ -130,11 +130,16 @@ public class ArticleServiceImpl implements ArticleService
 
     @Override
     public ArticleVO selectChildrenByCategoryId(Long id) {
-        return articleMapper.selectChildrenByiId(id);
+        return articleMapper.selectChildrenById(id);
     }
 
     @Override
     public ArticleVO selectArticleByCode(ArticleCategoryQuery articleCategoryQuery) {
         return articleMapper.selectArticleByCode(articleCategoryQuery);
     }
+
+    @Override
+    public ArticleVO selectArticleByCategoryId(Long id) {
+        return articleMapper.selectChildrenById(id);
+    }
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.java
index b56f9e8..89fcd42 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.java
@@ -64,13 +64,7 @@ public interface ArticleCategoryMapper
      */
     int deleteArticleCategoryById(Long id);
 
-    /**
-     * 批量删除文章分类
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteArticleCategoryByIds(Long[] ids);
+
 
 
     /**
@@ -82,10 +76,18 @@ public interface ArticleCategoryMapper
 
     /**
      * 查询子分类
-     * @param ids
+     * @param id
      * @return
      */
-    List<Long> selectChildren(Long[] ids);
+    List<Long> selectChildren(Long id);
 
 
+    /**
+     * 批量删除文章分类
+     *
+     * @param childrenIds 需要删除的数据主键集合
+     * @return 结果
+     */
+
+    void deleteArticleCategoryByIds(List<Long> childrenIds);
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java
index 3c438ac..aef61bb 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java
@@ -5,11 +5,14 @@ import java.util.*;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.bst.area.domain.AreaQuery;
 import com.ruoyi.bst.area.domain.AreaVO;
+import com.ruoyi.bst.article.domain.ArticleVO;
+import com.ruoyi.bst.article.service.ArticleService;
 import com.ruoyi.bst.device.utils.DeviceUtil;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServiceUtil;
 import com.ruoyi.common.utils.collection.CollectionUtils;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.bst.articleCategory.mapper.ArticleCategoryMapper;
@@ -31,6 +34,9 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService
     @Autowired
     private ArticleCategoryMapper articleCategoryMapper;
 
+    @Autowired
+    private ArticleService articleService;
+
     /**
      * 查询文章分类
      *
@@ -110,6 +116,11 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService
         return articleCategoryMapper.updateArticleCategory(articleCategory);
     }
 
+    @Override
+    public int deleteArticleCategoryByIds(Long[] ids) {
+        return 0;
+    }
+
     private Boolean hasParent(Long id){
         Long parentId = selectArticleCategoryById(id).getParentId();
         if (parentId != null){
@@ -123,30 +134,31 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService
      * @param ids 需要删除的文章分类主键
      * @return 结果
      */
-    @Override
-    @Transactional
-    public int deleteArticleCategoryByIds(Long[] ids)
-    {
-        List<Long> cids = articleCategoryMapper.selectChildren(ids);
-        List<Long> allIdsToDelete = new ArrayList<>();
-        allIdsToDelete.addAll(cids);
-        allIdsToDelete.addAll(Arrays.asList(ids));
-
-        if (!allIdsToDelete.isEmpty()){
-            return articleCategoryMapper.deleteArticleCategoryByIds(ids);
-        }
-        return 0;
-    }
+//    @Override
+//    @Transactional
+//    public int deleteArticleCategoryByIds(List<Long> ids)
+//    {
+//
+//        return articleCategoryMapper.deleteArticleCategoryByIds(ids);
+//    }
 
     /**
      * 删除文章分类信息
      *
-     * @param id 文章分类主键
+     * @param categoryId 文章分类主键
      * @return 结果
      */
     @Override
-    public int deleteArticleCategoryById(Long id)
+    public int deleteArticleCategoryById(Long categoryId)
     {
-        return articleCategoryMapper.deleteArticleCategoryById(id);
+        List<Long> childrenIds = articleCategoryMapper.selectChildren(categoryId);
+        if (childrenIds != null){
+            articleCategoryMapper.deleteArticleCategoryByIds(childrenIds);
+        }
+        ArticleVO articleVO = articleService.selectArticleByCategoryId(categoryId);
+        if (articleVO != null){
+            return 0;
+        }
+        return articleCategoryMapper.deleteArticleCategoryById(categoryId);
     }
 }
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java
index 82162e5..fec149e 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java
@@ -92,9 +92,9 @@ public class ArticleCategoryController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('bst:articleCategory:remove')")
     @Log(title = "文章分类", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+	@DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id)
     {
-        return toAjax(articleCategoryService.deleteArticleCategoryByIds(ids));
+        return success(articleCategoryService.deleteArticleCategoryById(id));
     }
 }