diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java index 5c788852..9f0150c0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java @@ -1,7 +1,6 @@ package com.jero.modules.laws.enterprise.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.system.vo.SysDepartTreeModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -76,7 +75,7 @@ public class LawsTreeNodeModel { private java.lang.Integer nodeType; /**排序*/ @ApiModelProperty(value = "排序") - private java.lang.Integer nodeOrder; + private java.lang.Double nodeOrder; private List children = new ArrayList<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsTreeNode.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsTreeNode.java index 45bd8919..d24e2013 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsTreeNode.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsTreeNode.java @@ -75,5 +75,5 @@ public class LawsTreeNode implements Serializable { private java.lang.Integer nodeType; /**排序*/ @ApiModelProperty(value = "排序") - private java.lang.String nodeOrder; + private java.lang.Double nodeOrder; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java index 80315ec7..2d230062 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java @@ -93,7 +93,7 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl + nodes.sort(Comparator.comparingDouble(node -> node.getNodeOrder() != null ? node.getNodeOrder() : 0)); // 递归对每个节点的子节点进行排序 @@ -236,7 +236,7 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl