From 9afe7ca53c38f2aa1010c2ac2a778012d133160f Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 03 六月 2025 16:42:03 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/TagController.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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..73158ad 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); @@ -154,7 +156,7 @@ public R query(String condition) { EntityWrapper<Tag> wrapper = new EntityWrapper<>(); wrapper.like("uuid", condition).or().like("name", condition); - Page<Tag> page = tagService.selectPage(new Page<>(0, 10), wrapper); + Page<Tag> page = tagService.selectPage(new Page<>(0, 10000), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (Tag tag : page.getRecords()){ Map<String, Object> map = new HashMap<>(); -- Gitblit v1.9.1