From 85399c49234a51323449ce93dfdd540b02947e5a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 四月 2025 08:20:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 6 ++++--
1 files changed, 4 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 4edd8cb..928e60e 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
@@ -268,10 +268,11 @@
@Override
- public List<CategoryVO> getCategoryVOTree(String categoryType){
+ public List<CategoryVO> getCategoryVOTree(String categoryType,Integer categoryId){
List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
.eq(Category::getIsdeleted, Constants.ZERO)
.in(Objects.nonNull(categoryType),Category::getType,categoryType.split(","))
+ .apply(Objects.nonNull(categoryId)," find_in_set("+categoryId+", REPLACE(ID_PATH,'/',',') ) ")
.orderByAsc(Category::getSortnum,Category::getId)
);
List<CategoryVO> categoryVOList = new ArrayList<>();
@@ -291,10 +292,11 @@
@Override
- public List<CategoryVO> getCategoryVOList(Integer categoryType){
+ public List<CategoryVO> getCategoryVOList(Integer categoryType,Integer isRoot){
List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
.eq(Category::getIsdeleted, Constants.ZERO)
.eq(Objects.nonNull(categoryType),Category::getType,categoryType)
+ .isNull(Constants.equalsInteger(isRoot,Constants.ONE),Category::getParentId)
.orderByAsc(Category::getSortnum,Category::getId)
);
List<CategoryVO> categoryVOList = new ArrayList<>();
--
Gitblit v1.9.3