mirror of https://github.com/elunez/eladmin
update getMenusByRoles
parent
5734c5b975
commit
2114341c88
|
@ -64,11 +64,13 @@ public class MenuServiceImpl implements MenuService {
|
|||
|
||||
@Override
|
||||
public List<MenuDTO> findByRoles(List<RoleSmallDTO> roles) {
|
||||
Set<Menu> menus = new LinkedHashSet<>();
|
||||
for (RoleSmallDTO role : roles) {
|
||||
List<Menu> menus1 = new ArrayList<>(menuRepository.findByRoles_IdAndTypeIsNotInOrderBySortAsc(role.getId(), 2));
|
||||
menus.addAll(menus1);
|
||||
}
|
||||
//Set<Menu> menus = new LinkedHashSet<>();
|
||||
//for (RoleSmallDTO role : roles) {
|
||||
// List<Menu> menus1 = new ArrayList<>(menuRepository.findByRoles_IdAndTypeIsNotInOrderBySortAsc(role.getId(), 2));
|
||||
// menus.addAll(menus1);
|
||||
//}
|
||||
Set<Long> roleIds = roles.stream().map(RoleSmallDTO::getId).collect(Collectors.toSet());
|
||||
LinkedHashSet<Menu> menus = menuRepository.findByRoles_IdInAndTypeNotOrderBySortAsc(roleIds, 2);
|
||||
return menus.stream().map(menuMapper::toDto).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue