From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/controller/TagController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TagController.java b/src/main/java/com/zy/asrs/controller/TagController.java
index 8fd2db1..c5e92f0 100644
--- a/src/main/java/com/zy/asrs/controller/TagController.java
+++ b/src/main/java/com/zy/asrs/controller/TagController.java
@@ -35,7 +35,9 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)Long parentId){
EntityWrapper<Tag> wrapper = new EntityWrapper<>();
- wrapper.eq("parent_id", parentId==null?getOriginTag().getId():parentId);
+ if(!Cools.isEmpty(parentId)) {
+ wrapper.eq("parent_id", parentId == null ? getOriginTag().getId() : parentId);
+ }
wrapper.orderBy("sort");
List<Tag> tags = tagService.selectList(wrapper);
return R.ok().add(tags);
--
Gitblit v1.9.1