gx

@@ -29,15 +29,27 @@ class NavController extends BaseController
      * @time   :2023/12/4 15:00
      */
     public function index(BNav $nav,BNavGroup $navGroup){
+//        $this->map['project_id'] = $this->user['project_id'];
+//        $lists = $nav->list($this->map,$this->order = ['sort','id']);
+//        //获取菜单组排序字段
+//        $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
+//        if(!empty($groupInfo['sort_list'])){
+//            $sort_list = json_decode($groupInfo['sort_list']);
+//            $data = $this->findDetailsList($sort_list,$lists);
+//        }else{
+//            $data = array();
+//            foreach ($lists as $v){
+//                $v = (array)$v;
+//                if ($v['pid'] == 0) {
+//                    $v['sub'] = _get_child($v['id'], $lists);
+//                    $data[]   = $v;
+//                }
+//            }
+//        }
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $nav->list($this->map,$this->order = ['sort','id']);
-        //获取菜单组排序字段
-        $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
-        if(!empty($groupInfo['sort_list'])){
-            $sort_list = json_decode($groupInfo['sort_list']);
-            $data = $this->findDetailsList($sort_list,$lists);
-        }else{
-            $data = array();
+        $data = array();
+        if(!empty($lists)){
             foreach ($lists as $v){
                 $v = (array)$v;
                 if ($v['pid'] == 0) {
@@ -45,10 +57,57 @@ class NavController extends BaseController
                     $data[]   = $v;
                 }
             }
+            //获取菜单组排序字段
+            $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
+            if(!empty($groupInfo['sort_list'])){
+                $sort_list = json_decode($groupInfo['sort_list']);
+                $detailsList = $this->getIdDetailsList($data);
+                $data = $this->findDetailsLists($sort_list,$detailsList);
+            }
         }
         $this->response('success',Code::SUCCESS,$data);
     }
 
+    public function findDetailsLists($sort_list, $detailsList)
+    {
+        $result = [];
+        foreach ($sort_list as $val) {
+            $val = (array)$val;
+            if (!empty($val['sub'])){
+                $this->findDetailsLists($val['sub'], $detailsList[$val['id']]['sub']);
+            }
+            if (empty($detailsList[$val['id']])){
+                continue;
+            }
+            $result[] = $detailsList[$val['id']];
+            unset($detailsList[$val['id']]);
+        }
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($detailsList, true) . PHP_EOL, FILE_APPEND);
+        $result = array_merge($result, $detailsList);
+
+        return $this->success($result);
+    }
+
+
+    /**
+     * @remark :根据id组装数据
+     * @name   :getDetailsList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/20 18:52
+     */
+    public function getIdDetailsList($data){
+        $detailsList = [];
+        foreach ($data as $v) {
+            if (!empty($v['sub'])){
+                $v['sub'] = $this->getIdDetailsList($v['sub']);
+            }
+            $detailsList[$v['id']] = $v;
+        }
+        return $this->success($detailsList);
+    }
+
+
     /**
      * @remark :根据固定的数组排序
      * @name   :findDetailsInList