From 4d4394311a96e15ea204e2cae03dda00750d0fdd Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 11 四月 2025 17:37:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 1 + 1 files changed, 1 insertions(+), 0 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 e32f0ef..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); -- Gitblit v1.9.3