diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java index bf05e23..4177a6b 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java @@ -51,9 +51,9 @@ public class TreeLabelManagerController { * @param id * @return */ - @ApiOperation("获取当前标签的路径List") + @ApiOperation("获取当前标签的父级路径") @GetMapping("/labelList/{id}") - public ResponseMessage add(@PathVariable String id) { + public ResponseMessage parentLabelList(@PathVariable String id) { List labelList = iTreeLabelService.getLabelList(id); return Result.success(labelList); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java index 7f06798..7de3c6a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java @@ -152,12 +152,13 @@ public class ITreeLabelServiceImpl extends ServiceImpl getLabelList(String id) { List labelList = new ArrayList<>(); TreeLabelEntity treeLabelEntity = getById(id); + //获取上层标签 + treeLabelEntity = getById(treeLabelEntity.getParentId()); + labelList.add(treeLabelEntity.getId()); while (!TreeLabelConstants.ROOT_TAG_PARENT_ID.equals(treeLabelEntity.getParentId())) { - labelList.add(treeLabelEntity.getId()); treeLabelEntity = getById(treeLabelEntity.getParentId()); + labelList.add(treeLabelEntity.getId()); } - TreeLabelEntity root = getById(TreeLabelConstants.ROOT_LABEL_ID); - labelList.add(root.getId()); Collections.reverse(labelList); return labelList; }