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, JpaSpecificat * @param pid / * @return / */ - List findByPid(long pid); + List findByPidOrderByMenuSort(long pid); /** * 查询顶级菜单 * @return / */ - List findByPidIsNull(); + List 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 getChildMenus(List menuList, Set menuSet) { for (Menu menu : menuList) { menuSet.add(menu); - List menus = menuRepository.findByPid(menu.getId()); + List 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 getMenus(Long pid) { List 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 getSuperior(MenuDto menuDto, List 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); }