作者 lyh

gx

@@ -59,19 +59,19 @@ class NavController extends BaseController @@ -59,19 +59,19 @@ class NavController extends BaseController
59 public function findDetailsList($data, $detailsList) { 59 public function findDetailsList($data, $detailsList) {
60 $result = []; 60 $result = [];
61 foreach ($data as $item) { 61 foreach ($data as $item) {
62 - $item = (array)$item; 62 + $items = (array)$item;
63 $id = $item['id']; 63 $id = $item['id'];
64 // 在给定的详情列表中查找匹配的id 64 // 在给定的详情列表中查找匹配的id
65 $matchingDetail = array_filter($detailsList, function ($detail) use ($id) { 65 $matchingDetail = array_filter($detailsList, function ($detail) use ($id) {
66 return $detail['id'] == $id; 66 return $detail['id'] == $id;
67 }); 67 });
68 if (!empty($matchingDetail)) { 68 if (!empty($matchingDetail)) {
69 - $item['details'] = reset($matchingDetail); 69 + $items = reset($matchingDetail);
70 } 70 }
71 if (!empty($item['sub'])) { 71 if (!empty($item['sub'])) {
72 - $item['sub'] = $this->findDetailsList($item['sub'], $detailsList); 72 + $items['sub'] = $this->findDetailsList((array)$item['sub'], $detailsList);
73 } 73 }
74 - $result[] = $item; 74 + $result[] = $items;
75 } 75 }
76 return $result; 76 return $result;
77 } 77 }