From 4ed592daedb2367a3a84cc0831cc77a382c160800081d590f5b661142cf19768 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Wed, 10 Sep 2025 11:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E6=A0=91?=
 =?UTF-8?q?=E7=8A=B6=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cdzy/staff/model/dto/EbikePermissionTreeNode.java     | 2 ++
 .../cdzy/staff/service/impl/EbikePermissionServiceImpl.java   | 2 ++
 ebike-staff/src/main/java/com/cdzy/staff/utils/TreeUtil.java  | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

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<EbikePermissionMappe
                 .buttonCode(ebikePermission.getButtonCode())
                 .icon(ebikePermission.getIcon())
                 .parentId(parentId)
+                .sort(ebikePermission.getSort())
                 .createBy(StpUtil.getLoginIdAsLong())
                 .build();
         ebikePermissionMapper.insert(permission);
@@ -70,6 +71,7 @@ public class EbikePermissionServiceImpl extends ServiceImpl<EbikePermissionMappe
         permission.setIcon(ebikePermission.getIcon());
         permission.setParentId(parentId);
         permission.setUpdateBy(StpUtil.getLoginIdAsLong());
+        permission.setSort(ebikePermission.getSort());
         ebikePermissionMapper.update(permission);
     }
 
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/utils/TreeUtil.java b/ebike-staff/src/main/java/com/cdzy/staff/utils/TreeUtil.java
index 2736d8a..08be99b 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/utils/TreeUtil.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/utils/TreeUtil.java
@@ -32,7 +32,9 @@ public class TreeUtil {
             Long nodeId = parentNode.getPermissionId();
             if (child != null && !child.isEmpty()) {
                 List<EbikePermissionTreeNode> list = child.stream().filter(Objects::nonNull).filter(childNode -> Objects.equals(nodeId, childNode.getParentId())).toList();
-                parentNode.setChildren(list);
+               if (!list.isEmpty()){
+                   parentNode.setChildren(list);
+               }
             }
         });
     }