gx

@@ -34,9 +34,8 @@ class NavController extends BaseController
         //获取菜单组排序字段
         //获取菜单组排序字段
         $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
         $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
         if(!empty($groupInfo['sort_list'])){
         if(!empty($groupInfo['sort_list'])){
-            $data = [];
             $sort_list = json_decode($groupInfo['sort_list']);
             $sort_list = json_decode($groupInfo['sort_list']);
-
+            $data = $this->findDetailsList($sort_list,$lists);
         }else{
         }else{
             $data = array();
             $data = array();
             foreach ($lists as $v){
             foreach ($lists as $v){
@@ -57,19 +56,19 @@ class NavController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/12/18 14:54
      * @time   :2023/12/18 14:54
      */
      */
-    public function findDetailsInList($data, $detailsList) {
+    public function findDetailsList($data, $detailsList) {
         $result = [];
         $result = [];
         foreach ($data as $item) {
         foreach ($data as $item) {
             $id = $item['id'];
             $id = $item['id'];
             // 在给定的详情列表中查找匹配的id
             // 在给定的详情列表中查找匹配的id
-//            $matchingDetail = array_filter($detailsList, function ($detail) use ($id) {
-//                return $detail['id'] == $id;
-//            });
-//            if (!empty($matchingDetail)) {
-//                $item['details'] = reset($matchingDetail);
-//            }
+            $matchingDetail = array_filter($detailsList, function ($detail) use ($id) {
+                return $detail['id'] == $id;
+            });
+            if (!empty($matchingDetail)) {
+                $item['details'] = reset($matchingDetail);
+            }
             if (!empty($item['sub'])) {
             if (!empty($item['sub'])) {
-                $item['sub'] = findDetailsInList($item['sub'], $detailsList);
+                $item['sub'] = $this->findDetailsList($item['sub'], $detailsList);
             }
             }
             $result[] = $item;
             $result[] = $item;
         }
         }