From 2114341c8885413647b0ed244bbf9ea776c70aab Mon Sep 17 00:00:00 2001
From: CCCY <cccy0@foxmail.com>
Date: Mon, 11 Nov 2019 22:59:27 +0800
Subject: [PATCH] update getMenusByRoles

---
 .../modules/system/service/impl/MenuServiceImpl.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 baadcfa2..a81f8823 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
@@ -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());
     }