From b55224c792ff67fc41fb035d200120017709102d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 四月 2025 08:17:56 +0800
Subject: [PATCH] 代码初始化

---
 server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index f9b7163..4edd8cb 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -199,6 +199,7 @@
                 .eq(category.getType() != null, Category::getType, category.getType())
                 .eq(category.getParentId() != null, Category::getParentId, category.getParentId())
                 .eq(category.getNamePath() != null, Category::getNamePath, category.getNamePath())
+                .isNull(category.getIsRoot() != null &&category.getIsRoot().equals(Constants.ONE), Category::getParentId)
                 .eq(category.getIdPath() != null, Category::getIdPath, category.getIdPath())
                 .orderByAsc( Category::getSortnum);
         return categoryMapper.selectJoinList(Category.class,queryWrapper);
@@ -267,10 +268,10 @@
 
 
     @Override
-    public List<CategoryVO>  getCategoryVOTree(Integer categoryType){
+    public List<CategoryVO>  getCategoryVOTree(String categoryType){
         List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
                 .eq(Category::getIsdeleted, Constants.ZERO)
-                .eq(Objects.nonNull(categoryType),Category::getType,categoryType)
+                .in(Objects.nonNull(categoryType),Category::getType,categoryType.split(","))
                 .orderByAsc(Category::getSortnum,Category::getId)
         );
         List<CategoryVO>  categoryVOList = new ArrayList<>();

--
Gitblit v1.9.3