|
@@ -170,7 +170,7 @@ class CheckActiveMenuService
|
|
|
return $item->count();
|
|
return $item->count();
|
|
|
})
|
|
})
|
|
|
//根据分组结果的二级列表降序排列
|
|
//根据分组结果的二级列表降序排列
|
|
|
- ->forPage(0, 5)
|
|
|
|
|
|
|
+// ->forPage(0, 5)
|
|
|
//取前数量最高的五条
|
|
//取前数量最高的五条
|
|
|
->keys();
|
|
->keys();
|
|
|
//只获取对应的菜单Id
|
|
//只获取对应的菜单Id
|
|
@@ -189,7 +189,7 @@ class CheckActiveMenuService
|
|
|
->get()->sortByDesc(function ($item) {
|
|
->get()->sortByDesc(function ($item) {
|
|
|
return $item->count();
|
|
return $item->count();
|
|
|
})
|
|
})
|
|
|
- ->forPage(0, 5)
|
|
|
|
|
|
|
+// ->forPage(0, 5)
|
|
|
->map(function ($item) {
|
|
->map(function ($item) {
|
|
|
return $item->menu_id;
|
|
return $item->menu_id;
|
|
|
});
|
|
});
|
|
@@ -202,10 +202,8 @@ class CheckActiveMenuService
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 将排好序的菜单集合构造为一级菜单嵌套二级菜单的形式
|
|
* 将排好序的菜单集合构造为一级菜单嵌套二级菜单的形式
|
|
|
- * @param array|null $menus
|
|
|
|
|
- * @return Collection|\Tightenco\Collect\Support\Collection
|
|
|
|
|
*/
|
|
*/
|
|
|
- public static function buildResult(?array $menus)
|
|
|
|
|
|
|
+ public static function buildResult($menus)
|
|
|
{
|
|
{
|
|
|
$result = collect([]);
|
|
$result = collect([]);
|
|
|
foreach ($menus as $menu) {
|
|
foreach ($menus as $menu) {
|
|
@@ -229,10 +227,9 @@ class CheckActiveMenuService
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 查找到对应子菜单的父菜单,并将其放入到父菜单的集合中
|
|
* 查找到对应子菜单的父菜单,并将其放入到父菜单的集合中
|
|
|
- * @param \Tightenco\Collect\Support\Collection $data
|
|
|
|
|
* @param $menu
|
|
* @param $menu
|
|
|
*/
|
|
*/
|
|
|
- public static function setToParent(\Tightenco\Collect\Support\Collection $data, $menu): void
|
|
|
|
|
|
|
+ public static function setToParent($data, $menu): void
|
|
|
{
|
|
{
|
|
|
//二级菜单
|
|
//二级菜单
|
|
|
$firstLevelMenu = $data->where('id', $menu->parent_id)->first();
|
|
$firstLevelMenu = $data->where('id', $menu->parent_id)->first();
|