Merge branch 'hylyasrs' of http://47.97.1.152:5880/r/zy-asrs into hylyasrs

whycq

2022-08-06 7d7090b098add475808ffdebebff8b4e2a3b98ff

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