From becbbb1340463e0116bd1cea7fa14dff53ca35de Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 23 Aug 2024 14:11:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java  | 3 +--
 .../com/jero/modules/laws/standard/entity/LawsTreeNode.java   | 2 +-
 .../laws/standard/service/impl/LawsTreeNodeServiceImpl.java   | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

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<LawsTreeNodeModel> 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<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);
         }
     }