From b7b721b13b9d7be7134e2d66706d30ffdf7acd87 Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Sun, 12 Jun 2022 15:55:15 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84](master):?=
 =?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/repository/MenuRepository.java      |  4 ++--
 .../modules/system/service/impl/MenuServiceImpl.java   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java
index 0907606f..75fd7ff5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java
@@ -49,13 +49,13 @@ public interface MenuRepository extends JpaRepository<Menu, Long>, JpaSpecificat
      * @param pid /
      * @return /
      */
-    List<Menu> findByPid(long pid);
+    List<Menu> findByPidOrderByMenuSort(long pid);
 
     /**
      * 查询顶级菜单
      * @return /
      */
-    List<Menu> findByPidIsNull();
+    List<Menu> findByPidIsNullOrderByMenuSort();
 
     /**
      * 根据角色ID与菜单类型查询菜单
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
index 229186bd..c1bc4d1f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
@@ -189,7 +189,7 @@ public class MenuServiceImpl implements MenuService {
     public Set<Menu> getChildMenus(List<Menu> menuList, Set<Menu> menuSet) {
         for (Menu menu : menuList) {
             menuSet.add(menu);
-            List<Menu> menus = menuRepository.findByPid(menu.getId());
+            List<Menu> menus = menuRepository.findByPidOrderByMenuSort(menu.getId());
             if(menus!=null && menus.size()!=0){
                 getChildMenus(menus, menuSet);
             }
@@ -213,9 +213,9 @@ public class MenuServiceImpl implements MenuService {
     public List<MenuDto> getMenus(Long pid) {
         List<Menu> menus;
         if(pid != null && !pid.equals(0L)){
-            menus = menuRepository.findByPid(pid);
+            menus = menuRepository.findByPidOrderByMenuSort(pid);
         } else {
-            menus = menuRepository.findByPidIsNull();
+            menus = menuRepository.findByPidIsNullOrderByMenuSort();
         }
         return menuMapper.toDto(menus);
     }
@@ -223,10 +223,10 @@ public class MenuServiceImpl implements MenuService {
     @Override
     public List<MenuDto> getSuperior(MenuDto menuDto, List<Menu> menus) {
         if(menuDto.getPid() == null){
-            menus.addAll(menuRepository.findByPidIsNull());
+            menus.addAll(menuRepository.findByPidIsNullOrderByMenuSort());
             return menuMapper.toDto(menus);
         }
-        menus.addAll(menuRepository.findByPid(menuDto.getPid()));
+        menus.addAll(menuRepository.findByPidOrderByMenuSort(menuDto.getPid()));
         return getSuperior(findById(menuDto.getPid()), menus);
     }