|
@@ -6,6 +6,7 @@ import cn.reghao.devops.manager.account.model.po.Role;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* @author reghao
|
|
* @author reghao
|
|
@@ -30,7 +31,7 @@ public class HomeService {
|
|
|
List<Menu> menus = new ArrayList<>();
|
|
List<Menu> menus = new ArrayList<>();
|
|
|
roles.forEach(name -> {
|
|
roles.forEach(name -> {
|
|
|
Role role = roleQuery.findByName(name);
|
|
Role role = roleQuery.findByName(name);
|
|
|
- menus.addAll(role.getMenus());
|
|
|
|
|
|
|
+ menus.addAll(role.getMenus().stream().filter(Menu::getEnabled).collect(Collectors.toSet()));
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
return menus;
|
|
return menus;
|