Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

 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);