fix: 体系支持小数排序

This commit is contained in:
2024-08-23 14:13:30 +08:00
parent 9ec3fe9ab8
commit becbbb1340
3 changed files with 4 additions and 5 deletions
@@ -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<LawsTreeNodeModel> children = new ArrayList<>();
@@ -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;
}
@@ -93,7 +93,7 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
}
// 对当前层级的节点按 nodeOrder 排序,将 null 视为 0
nodes.sort(Comparator.comparingInt(node ->
nodes.sort(Comparator.comparingDouble(node ->
node.getNodeOrder() != null ? node.getNodeOrder() : 0));
// 递归对每个节点的子节点进行排序
@@ -236,7 +236,7 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
for (LawsTreeNode node : list) {
String nodeCode = node.getNodeCode();
String order = nodeCode.substring(nodeCode.length() - 1);
node.setNodeOrder(order);
node.setNodeOrder(Double.valueOf(order));
this.updateById(node);
}
}