From 6b6570072dc704d981e71618c8739ab1cca775c5 Mon Sep 17 00:00:00 2001
From: lizhengwei <lizhengwei@dcrays.cn>
Date: Fri, 13 Mar 2026 14:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/H5ComponentCategoryService.java   | 28 +++++++-------
 .../impl/H5ComponentCategoryServiceImpl.java  | 38 +++++++++----------
 2 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java
index 47aefb07f..71426298c 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java
@@ -15,20 +15,20 @@ import java.util.List;
  */
 public interface H5ComponentCategoryService {
 
-    /**
-     * 查询所有一级分类
-     *
-     * @return 一级分类列表
-     */
-    List<H5ComponentCategory> getTopLevelCategories();
-
-    /**
-     * 根据父分类 ID 查询子分类
-     *
-     * @param parentId 父分类 ID
-     * @return 子分类列表
-     */
-    List<H5ComponentCategory> getChildCategories(Long parentId);
+//    /**
+//     * 查询所有一级分类
+//     *
+//     * @return 一级分类列表
+//     */
+//    List<H5ComponentCategory> getTopLevelCategories();
+//
+//    /**
+//     * 根据父分类 ID 查询子分类
+//     *
+//     * @param parentId 父分类 ID
+//     * @return 子分类列表
+//     */
+//    List<H5ComponentCategory> getChildCategories(Long parentId);
 
     /**
      * 根据类型查询分类
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java
index 5b0cc840a..b113faa23 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java
@@ -30,25 +30,23 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class H5ComponentCategoryServiceImpl extends ServiceImpl<H5ComponentCategoryDao, H5ComponentCategory> implements H5ComponentCategoryService {
 
-    private final H5ComponentCategoryDao h5ComponentCategoryDao;
+//    @Override
+//    public List<H5ComponentCategory> getTopLevelCategories() {
+//        LambdaQueryWrapper<H5ComponentCategory> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(H5ComponentCategory::getParentId, 0L)
+//            .orderByAsc(H5ComponentCategory::getSort);
+//
+//        return baseMapper.selectList(wrapper);
+//    }
 
-    @Override
-    public List<H5ComponentCategory> getTopLevelCategories() {
-        LambdaQueryWrapper<H5ComponentCategory> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(H5ComponentCategory::getParentId, 0L)
-            .orderByAsc(H5ComponentCategory::getSort);
-
-        return baseMapper.selectList(wrapper);
-    }
-
-    @Override
-    public List<H5ComponentCategory> getChildCategories(Long parentId) {
-        LambdaQueryWrapper<H5ComponentCategory> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(H5ComponentCategory::getParentId, parentId)
-            .orderByAsc(H5ComponentCategory::getSort);
-
-        return baseMapper.selectList(wrapper);
-    }
+//    @Override
+//    public List<H5ComponentCategory> getChildCategories(Long parentId) {
+//        LambdaQueryWrapper<H5ComponentCategory> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(H5ComponentCategory::getParentId, parentId)
+//            .orderByAsc(H5ComponentCategory::getSort);
+//
+//        return baseMapper.selectList(wrapper);
+//    }
 
     @Override
     public List<H5ComponentCategory> getCategoriesByType(String type) {
@@ -100,7 +98,7 @@ public class H5ComponentCategoryServiceImpl extends ServiceImpl<H5ComponentCateg
     public List<H5ComponentCategoryTreeVO> getCategoryTree() {
         // 一次性查询所有分类（排除已删除的）
         LambdaQueryWrapper<H5ComponentCategory> wrapper = new LambdaQueryWrapper<>();
-        wrapper.orderByAsc(H5ComponentCategory::getParentId, H5ComponentCategory::getSort);
+        wrapper.orderByAsc(H5ComponentCategory::getId, H5ComponentCategory::getSort);
 
         List<H5ComponentCategory> allCategories = baseMapper.selectList(wrapper);
 
@@ -176,7 +174,7 @@ public class H5ComponentCategoryServiceImpl extends ServiceImpl<H5ComponentCateg
             wrapper.like(H5ComponentCategory::getName, queryDTO.getKeyword());
         }
         // 排序
-        wrapper.orderByAsc(H5ComponentCategory::getSort);
+        wrapper.orderByAsc(H5ComponentCategory::getId, H5ComponentCategory::getSort);
 
         return baseMapper.selectPage(new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize()), wrapper);
     }