(shenyu) branch master updated: [fix] fix dashboard menu children sort not working problem (#5691)

[achao]

This is an automated email from the ASF dual-hosted git repository.

achao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new bf29768d52 [fix] fix dashboard menu children sort not working problem 
(#5691)
bf29768d52 is described below

commit bf29768d526793b897049dbebb6cd1a0374b039a
Author: VampireAchao <ac...@apache.org>
AuthorDate: Thu Oct 10 22:17:50 2024 +0800

    [fix] fix dashboard menu children sort not working problem (#5691)
---
 .../src/main/java/org/apache/shenyu/admin/utils/ResourceUtil.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ResourceUtil.java 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ResourceUtil.java
index 4120f56b81..72e7da84a0 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ResourceUtil.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ResourceUtil.java
@@ -41,6 +41,10 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsLast;
+
 /**
  * ResourceUtil.
  */
@@ -171,7 +175,9 @@ public final class ResourceUtil {
                     PermissionMenuVO.MenuInfo menuInfo = 
menuInfoMap.get(parent);
                     if (CollectionUtils.isNotEmpty(children)) {
                         List<PermissionMenuVO.MenuInfo> targetList = 
Objects.isNull(menuInfo) ? retList : menuInfo.getChildren();
-                        
children.stream().map(menuInfoMap::get).filter(Objects::nonNull).forEach(targetList::add);
+                        
children.stream().map(menuInfoMap::get).filter(Objects::nonNull)
+                                
.sorted(comparing(PermissionMenuVO.MenuInfo::getSort, 
nullsLast(naturalOrder())))
+                                .forEach(targetList::add);
                     }
                 });