合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3356

@@ -47,7 +47,7 @@ class GeoLogic extends BaseLogic
     public function getCongInfo($project_id)
     {
         $projectModel = new Project();
-        $project_geo_conf = $projectModel->read(['id' => $project_id],['title', 'version', 'geo_status', 'geo_qualify_num']);
+        $project_geo_conf = $projectModel->read(['id' => $project_id],['title', 'version', 'geo_status', 'geo_qualify_num','company']);
         $geoConfModel = new GeoConf();
         $geo_conf = $geoConfModel->read(['project_id' => $project_id]);
         $deployModel = new DeployBuild();
@@ -56,7 +56,7 @@ class GeoLogic extends BaseLogic
         $geo_conf['seo_plan_name'] = $seo_plan_name;
         if($geo_conf === false){//数据未初始化
             $geo_conf = [
-                'project_id' => $project_id, 'manager_id'=>0, 'company'=>$project_geo_conf['title'], 'brand'=>'', 'description'=>'','seo_plan_name'=>$seo_plan_name
+                'project_id' => $project_id, 'manager_id'=>0, 'company'=>$project_geo_conf['company'], 'brand'=>'', 'description'=>'','seo_plan_name'=>$seo_plan_name
             ];
         }
         //负责人集合