gx

@@ -34,13 +34,9 @@ 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']);
-            foreach ($sort_list as $k => $v){
-                if(isset($v['sub']) && !empty($v['sub'])){
 
 
-                }
-
-            }
         }else{
         }else{
             $data = array();
             $data = array();
             foreach ($lists as $v){
             foreach ($lists as $v){
@@ -54,8 +50,30 @@ class NavController extends BaseController
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
-    public function getNavList(){
-
+    /**
+     * @remark :根据固定的数组排序
+     * @name   :findDetailsInList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/18 14:54
+     */
+    public function findDetailsInList($data, $detailsList) {
+        $result = [];
+        foreach ($data as $item) {
+            $id = $item['id'];
+            // 在给定的详情列表中查找匹配的id
+//            $matchingDetail = array_filter($detailsList, function ($detail) use ($id) {
+//                return $detail['id'] == $id;
+//            });
+//            if (!empty($matchingDetail)) {
+//                $item['details'] = reset($matchingDetail);
+//            }
+            if (!empty($item['sub'])) {
+                $item['sub'] = findDetailsInList($item['sub'], $detailsList);
+            }
+            $result[] = $item;
+        }
+        return $result;
     }
     }
 
 
     /**
     /**

@@ -714,7 +714,7 @@ class ProjectLogic extends BaseLogic
                 'company_name'=>$projectInfo['company'],
                 'company_name'=>$projectInfo['company'],
                 'principal_mobile'=>$projectInfo['mobile'],
                 'principal_mobile'=>$projectInfo['mobile'],
                 'remark'=>'',
                 'remark'=>'',
-                'exclusive_aicc_day'=>$projectInfo['exclusive_aicc_day'] ?: 1,
+                'exclusive_aicc_day'=>$this->param['exclusive_aicc_day'] ?: 1,
                 'from_order_id'=>$projectInfo['from_order_id']
                 'from_order_id'=>$projectInfo['from_order_id']
             ];
             ];
             $this->toAicc($data);
             $this->toAicc($data);
@@ -724,7 +724,7 @@ class ProjectLogic extends BaseLogic
             $data = [
             $data = [
                 'company_name'=>$projectInfo['company'],
                 'company_name'=>$projectInfo['company'],
                 'principal_mobile'=>$projectInfo['mobile'],
                 'principal_mobile'=>$projectInfo['mobile'],
-                'exclusive_hagro_day'=>$projectInfo['exclusive_hagro_day'] ?: 1,
+                'exclusive_hagro_day'=>$this->param['exclusive_hagro_day'] ?: 1,
                 'from_order_id'=>$projectInfo['from_order_id'],
                 'from_order_id'=>$projectInfo['from_order_id'],
                 'company_id'=>$projectInfo['channel']['channel_id']
                 'company_id'=>$projectInfo['channel']['channel_id']
             ];
             ];