Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -62,11 +62,13 @@ class OptimizationReportController extends BaseController
                 'cert_info' => date('Y-m-d', strtotime($domain_info['certificate_start_time'])) . ' - ' .date('Y-m-d', strtotime($domain_info['certificate_end_time'])),
                 'cert_info' => date('Y-m-d', strtotime($domain_info['certificate_start_time'])) . ' - ' .date('Y-m-d', strtotime($domain_info['certificate_end_time'])),
             ];
             ];
         }
         }
+        //外链周期分析
+        $external_links = ExternalLinks::where('project_id', $this->param['project_id'])->first();
         $data['domain'] = $domain_info;
         $data['domain'] = $domain_info;
         //方案信息
         //方案信息
         $data['plan_information'] = $this->plan_information($projectInfo,$domain_info);
         $data['plan_information'] = $this->plan_information($projectInfo,$domain_info);
         //排名数据
         //排名数据
-        $data['first_total'] = $this->first_total();
+        $data['first_total'] = $this->first_total($external_links);
         //关键词排名分析图
         //关键词排名分析图
         $data['rank_chat'] = $this->rank_chat();
         $data['rank_chat'] = $this->rank_chat();
         //关键词排名明细
         //关键词排名明细
@@ -77,8 +79,7 @@ class OptimizationReportController extends BaseController
         $data['count_30'] = $this->count_30_total();
         $data['count_30'] = $this->count_30_total();
         //访问国家前10
         //访问国家前10
         $data['access_country_count'] = $this->access_country_count();
         $data['access_country_count'] = $this->access_country_count();
-        //外链周期分析
-        $external_links = ExternalLinks::where('project_id', $this->param['project_id'])->first();
+
         //SEO数据周期分析图 外链数
         //SEO数据周期分析图 外链数
         $data['external_links_chat'] = [
         $data['external_links_chat'] = [
             'labels' => array_keys($external_links['data'] ?? []),
             'labels' => array_keys($external_links['data'] ?? []),
@@ -295,7 +296,7 @@ class OptimizationReportController extends BaseController
      * @method :post
      * @method :post
      * @time   :2024/3/7 16:58
      * @time   :2024/3/7 16:58
      */
      */
-    public function first_total(){
+    public function first_total($external_links){
         $rank = RankData::where('project_id', $this->param['project_id'])->first();
         $rank = RankData::where('project_id', $this->param['project_id'])->first();
         return [
         return [
             'first_num' => $rank['first_num'] ?? 0,
             'first_num' => $rank['first_num'] ?? 0,

@@ -157,9 +157,13 @@ class SuppliersController extends BaseController
         $action_name = 'supplier_area';
         $action_name = 'supplier_area';
         $param = [
         $param = [
             'prod_desc'=>$this->param['prod_desc'] ?? '',
             'prod_desc'=>$this->param['prod_desc'] ?? '',
-            'start_date'=>$this->param['start_date'] ?? '',
-            'end_date'=>$this->param['end_date'] ?? '',
         ];
         ];
+        if(isset($this->param['start_date'] )){
+            $param['start_date'] = $this->param['start_date'] ?? '';
+        }
+        if(isset($this->param['end_date'] )){
+            $param['end_date'] = $this->param['end_date'] ?? '';
+        }
         $res = $this->_action($api_url,$action_name,$param);
         $res = $this->_action($api_url,$action_name,$param);
         $this->response('success',Code::SUCCESS,$res);
         $this->response('success',Code::SUCCESS,$res);
     }
     }
@@ -176,8 +180,10 @@ class SuppliersController extends BaseController
         $action_name = 'trade_partner';
         $action_name = 'trade_partner';
         $param = [
         $param = [
             'com_id'=>$this->param['com_id'] ?? '',
             'com_id'=>$this->param['com_id'] ?? '',
-            'com_role'=>$this->param['com_role'] ?? '',
         ];
         ];
+        if(isset($this->param['com_role'] )){
+            $param['com_role'] = $this->param['com_role'] ?? '';
+        }
         $res = $this->_action($api_url,$action_name,$param);
         $res = $this->_action($api_url,$action_name,$param);
         $this->response('success',Code::SUCCESS,$res);
         $this->response('success',Code::SUCCESS,$res);
     }
     }