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

变更数据



查看合并请求 !3118

@@ -49,15 +49,15 @@ class GeoLogic extends BaseLogic
         $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']);
         $geoConfModel = new GeoConf();
         $geoConfModel = new GeoConf();
         $geo_conf = $geoConfModel->read(['project_id' => $project_id]);
         $geo_conf = $geoConfModel->read(['project_id' => $project_id]);
+        $deployModel = new DeployBuild();
+        $seo_plan = $deployModel->getValue(['project_id'=>$project_id],'seo_plan');
+        $seo_plan_name = ($projectModel::seoMap()[$seo_plan]) ?? '无选择';
+        $geo_conf['seo_plan_name'] = $seo_plan_name;
         if($geo_conf === false){//数据未初始化
         if($geo_conf === false){//数据未初始化
             $geo_conf = [
             $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['title'], 'brand'=>'', 'description'=>'','seo_plan_name'=>$seo_plan_name
             ];
             ];
         }
         }
-        $deployModel = new DeployBuild();
-        $seo_plan = $deployModel->getValue(['project_id'=>$project_id],'seo_plan');
-        $seo_plan_name = ($projectModel::seoMap()[$seo_plan]) ?? '无选择';
-        $geo_conf['seo_plan_name'] = $seo_plan_name;
         //负责人集合
         //负责人集合
         $geo_manage_list = $geoConfModel->geoManage();
         $geo_manage_list = $geoConfModel->geoManage();
         // geo配置管理员，已经移除管理员列表，补充管理员信息
         // geo配置管理员，已经移除管理员列表，补充管理员信息