github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

[代码完善](master): 代码优化

pull/751/head
Zheng Jie 2022-06-12 15:55:15 +08:00
parent 2dc528a103
commit b7b721b13b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java
View File

@ -49,13 +49,13 @@ public interface MenuRepository extends JpaRepository<Menu, Long>, JpaSpecificat
* @param pid / * @param pid /
* @return / * @return /
*/ */
List<Menu> findByPid(long pid); List<Menu> findByPidOrderByMenuSort(long pid);
/** /**
* 查询顶级菜单 * 查询顶级菜单
* @return / * @return /
*/ */
List<Menu> findByPidIsNull(); List<Menu> findByPidIsNullOrderByMenuSort();
/** /**
* 根据角色ID与菜单类型查询菜单 * 根据角色ID与菜单类型查询菜单

10
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
View File

@ -189,7 +189,7 @@ public class MenuServiceImpl implements MenuService {
public Set<Menu> getChildMenus(List<Menu> menuList, Set<Menu> menuSet) { public Set<Menu> getChildMenus(List<Menu> menuList, Set<Menu> menuSet) {
for (Menu menu : menuList) { for (Menu menu : menuList) {
menuSet.add(menu); menuSet.add(menu);
List<Menu> menus = menuRepository.findByPid(menu.getId()); List<Menu> menus = menuRepository.findByPidOrderByMenuSort(menu.getId());
if(menus!=null && menus.size()!=0){ if(menus!=null && menus.size()!=0){
getChildMenus(menus, menuSet); getChildMenus(menus, menuSet);
} }
@ -213,9 +213,9 @@ public class MenuServiceImpl implements MenuService {
public List<MenuDto> getMenus(Long pid) { public List<MenuDto> getMenus(Long pid) {
List<Menu> menus; List<Menu> menus;
if(pid != null && !pid.equals(0L)){ if(pid != null && !pid.equals(0L)){
menus = menuRepository.findByPid(pid); menus = menuRepository.findByPidOrderByMenuSort(pid);
} else { } else {
menus = menuRepository.findByPidIsNull(); menus = menuRepository.findByPidIsNullOrderByMenuSort();
} }
return menuMapper.toDto(menus); return menuMapper.toDto(menus);
} }
@ -223,10 +223,10 @@ public class MenuServiceImpl implements MenuService {
@Override @Override
public List<MenuDto> getSuperior(MenuDto menuDto, List<Menu> menus) { public List<MenuDto> getSuperior(MenuDto menuDto, List<Menu> menus) {
if(menuDto.getPid() == null){ if(menuDto.getPid() == null){
menus.addAll(menuRepository.findByPidIsNull()); menus.addAll(menuRepository.findByPidIsNullOrderByMenuSort());
return menuMapper.toDto(menus); return menuMapper.toDto(menus);
} }
menus.addAll(menuRepository.findByPid(menuDto.getPid())); menus.addAll(menuRepository.findByPidOrderByMenuSort(menuDto.getPid()));
return getSuperior(findById(menuDto.getPid()), menus); return getSuperior(findById(menuDto.getPid()), menus);
} }