diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java index e00cd1a..a43c2d1 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java @@ -31,7 +31,7 @@ public class TreeLabelEntity implements Serializable { /** * */ - private String name; + private String label; /** * 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 dd8a121..088a674 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 @@ -140,7 +140,7 @@ public class ITreeLabelServiceImpl extends ServiceImpl tree = new ArrayList<>(); for (TreeLabelVo label : treeLabelVos) { if (label.getParentId().equals(rootParentId)) { - label.setChildLabel(createTree(label.getId(), treeLabelVos)); + label.setChildren(createTree(label.getId(), treeLabelVos)); tree.add(label); } } @@ -150,20 +150,20 @@ public class ITreeLabelServiceImpl extends ServiceImpl childLabel = new ArrayList<>(); - if (root.getChildLabel() != null) { - for (TreeLabelVo child : root.getChildLabel()) { + if (root.getChildren() != null) { + for (TreeLabelVo child : root.getChildren()) { TreeLabelVo newChild = filterByName(child, name); if (newChild != null) { childLabel.add(newChild); } } } - newRoot.setChildLabel(childLabel.isEmpty() ? null : childLabel); - return root.getName().contains(name) || !childLabel.isEmpty() ? newRoot : null; + newRoot.setChildren(childLabel.isEmpty() ? null : childLabel); + return root.getLabel().contains(name) || !childLabel.isEmpty() ? newRoot : null; } } diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java index a8ee8f8..8951d5a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java @@ -27,7 +27,7 @@ public class TreeLabelVo { * 标签名称 */ @NotBlank(message = "名称不能为空") - private String name; + private String label; /** * 备注 @@ -48,10 +48,10 @@ public class TreeLabelVo { /** * 子标签 */ - private List childLabel; + private List children; public TreeLabelVo(String parentId) { this.parentId = parentId; - this.childLabel = new ArrayList<>(); + this.children = new ArrayList<>(); } }