diff --git a/ebike-staff/src/main/java/com/cdzy/staff/model/dto/EbikePermissionTreeNode.java b/ebike-staff/src/main/java/com/cdzy/staff/model/dto/EbikePermissionTreeNode.java index 362b4c0..eaad52f 100644 --- a/ebike-staff/src/main/java/com/cdzy/staff/model/dto/EbikePermissionTreeNode.java +++ b/ebike-staff/src/main/java/com/cdzy/staff/model/dto/EbikePermissionTreeNode.java @@ -44,6 +44,8 @@ public class EbikePermissionTreeNode implements Serializable { */ private Integer type; + private Integer sort; + private Long createBy; private LocalDateTime createTime; diff --git a/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikePermissionServiceImpl.java b/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikePermissionServiceImpl.java index e05159a..5ab538f 100644 --- a/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikePermissionServiceImpl.java +++ b/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikePermissionServiceImpl.java @@ -47,6 +47,7 @@ public class EbikePermissionServiceImpl extends ServiceImpl list = child.stream().filter(Objects::nonNull).filter(childNode -> Objects.equals(nodeId, childNode.getParentId())).toList(); - parentNode.setChildren(list); + if (!list.isEmpty()){ + parentNode.setChildren(list); + } } }); }