|
...
|
...
|
@@ -59,19 +59,19 @@ class NavController extends BaseController |
|
|
|
public function findDetailsList($data, $detailsList) {
|
|
|
|
$result = [];
|
|
|
|
foreach ($data as $item) {
|
|
|
|
$item = (array)$item;
|
|
|
|
$items = (array)$item;
|
|
|
|
$id = $item['id'];
|
|
|
|
// 在给定的详情列表中查找匹配的id
|
|
|
|
$matchingDetail = array_filter($detailsList, function ($detail) use ($id) {
|
|
|
|
return $detail['id'] == $id;
|
|
|
|
});
|
|
|
|
if (!empty($matchingDetail)) {
|
|
|
|
$item['details'] = reset($matchingDetail);
|
|
|
|
$items = reset($matchingDetail);
|
|
|
|
}
|
|
|
|
if (!empty($item['sub'])) {
|
|
|
|
$item['sub'] = $this->findDetailsList($item['sub'], $detailsList);
|
|
|
|
$items['sub'] = $this->findDetailsList((array)$item['sub'], $detailsList);
|
|
|
|
}
|
|
|
|
$result[] = $item;
|
|
|
|
$result[] = $items;
|
|
|
|
}
|
|
|
|
return $result;
|
|
|
|
}
|
...
|
...
|
|