|
...
|
...
|
@@ -56,12 +56,13 @@ class NavController extends BaseController |
|
|
|
* @method :post
|
|
|
|
* @time :2023/12/18 14:54
|
|
|
|
*/
|
|
|
|
public function findDetailsList($data,$detailsList) {
|
|
|
|
public function findDetailsList($detailsList,$data) {
|
|
|
|
$result = [];
|
|
|
|
foreach ($data as $item) {
|
|
|
|
$items = $item = (array)$item;
|
|
|
|
$id = $item['id'];
|
|
|
|
// 在给定的详情列表中查找匹配的id
|
|
|
|
$matchingDetail = [];
|
|
|
|
foreach ($detailsList as $k => $v){
|
|
|
|
if($id == $v['id']){
|
|
|
|
$matchingDetail = $v;
|
|
...
|
...
|
@@ -71,17 +72,14 @@ class NavController extends BaseController |
|
|
|
if (!empty($matchingDetail)) {
|
|
|
|
$items = reset($matchingDetail);
|
|
|
|
}
|
|
|
|
if (!empty($item['sub']) && is_array($item['sub'])) {
|
|
|
|
$items['sub'] = $this->findDetailsList($item['sub'], $detailsList);
|
|
|
|
if (!empty($item['sub'])) {
|
|
|
|
$items['sub'] = $this->findDetailsList((array)$item['sub'], $detailsList);
|
|
|
|
}
|
|
|
|
$result[] = $items;
|
|
|
|
}
|
|
|
|
@file_put_contents(storage_path('logs/lyh_error.log'), var_export($detailsList, true) . PHP_EOL, FILE_APPEND);
|
|
|
|
return $result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :获取当前id下的所有子集
|
|
|
|
* @name :getSubList
|
...
|
...
|
|