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

变更数据



查看合并请求 !3104

@@ -8,6 +8,7 @@
 namespace App\Models\Geo;
 namespace App\Models\Geo;
 
 
 use App\Models\Base;
 use App\Models\Base;
+use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Workchat\MessagePush;
 use App\Models\Workchat\MessagePush;
 
 
@@ -115,10 +116,12 @@ class GeoConfirm extends Base
         $token = uniqid().$friend_id;
         $token = uniqid().$friend_id;
         $created_at = $updated_at = now();
         $created_at = $updated_at = now();
         $projectModel = new Project();
         $projectModel = new Project();
-        $projectInfo = $projectModel->read(['id'=>$project_id],['company','seo_plan']);
-        $seo_plan = ($projectModel::seoMap()[$projectInfo['seo_plan']]) ?? '无选择';
+        $company = $projectModel->getValue(['id'=>$project_id],'company');
+        $deployModel = new DeployBuild();
+        $seo_plan = $deployModel->getValue(['project_id'=>$project_id],'seo_plan');
+        $seo_plan_name = ($projectModel::seoMap()[$seo_plan]) ?? '无选择';
         $content_array = [
         $content_array = [
-            'title' => "【{$projectInfo['company']} {$seo_plan}】".self::typeMapping()[$data->type],
+            'title' => "【{$company} {$seo_plan_name}】".self::typeMapping()[$data->type],
             'desc' => self::typeDesc()[$data->type],
             'desc' => self::typeDesc()[$data->type],
             'size' => 0,
             'size' => 0,
             'thumbSize' => 0,
             'thumbSize' => 0,

@@ -8,6 +8,7 @@
 namespace App\Models\Geo;
 namespace App\Models\Geo;
 
 
 use App\Models\Base;
 use App\Models\Base;
+use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\Workchat\MessagePush;
 use App\Models\Workchat\MessagePush;
@@ -92,11 +93,13 @@ class GeoWritings extends Base
             'send_at' => time()
             'send_at' => time()
         ];
         ];
         $projectModel = new Project();
         $projectModel = new Project();
-        $projectInfo = $projectModel->read(['id'=>$project_id],['company','seo_plan']);
-        $seo_plan = ($projectModel::seoMap()[$projectInfo['seo_plan']]) ?? '无选择';
+        $company = $projectModel->getValue(['id'=>$project_id],'company');
+        $deployModel = new DeployBuild();
+        $seo_plan = $deployModel->getValue(['project_id'=>$project_id],'seo_plan');
+        $seo_plan_name = ($projectModel::seoMap()[$seo_plan]) ?? '无选择';
         $token = Crypt::encrypt($param);
         $token = Crypt::encrypt($param);
         $content_array = [
         $content_array = [
-            'title' => "【{$projectInfo['company']} {$seo_plan}】核心文章已整理，请查看并确认",
+            'title' => "【{$company} {$seo_plan_name}】核心文章已整理，请查看并确认",
             'desc' => '需选择确认10篇文章，后续根据您确认的文章进行外链发布。',
             'desc' => '需选择确认10篇文章，后续根据您确认的文章进行外链发布。',
             'size' => 0,
             'size' => 0,
             'thumbSize' => 0,
             'thumbSize' => 0,