gx

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