From ef358a8d86e3f29f6924ebc572d97525f6f023d2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 18:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java |    4 ++--
 1 files changed, 2 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..e32f0ef 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
@@ -267,10 +267,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