周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 8900c950676d83f3e19c0f357cc9a37421276ad1 1 个父辈 26941e14

变更数据

内嵌 并排对比
正在显示 2 个修改的文件 包含 12 行增加 和 6 行删除
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 namespace App\Models\Geo; 8 namespace App\Models\Geo;
9 9
10 use App\Models\Base; 10 use App\Models\Base;
  11 +use App\Models\Project\DeployBuild;
11 use App\Models\Project\Project; 12 use App\Models\Project\Project;
12 use App\Models\Workchat\MessagePush; 13 use App\Models\Workchat\MessagePush;
13 14
@@ -115,10 +116,12 @@ class GeoConfirm extends Base @@ -115,10 +116,12 @@ class GeoConfirm extends Base
115 $token = uniqid().$friend_id; 116 $token = uniqid().$friend_id;
116 $created_at = $updated_at = now(); 117 $created_at = $updated_at = now();
117 $projectModel = new Project(); 118 $projectModel = new Project();
118 - $projectInfo = $projectModel->read(['id'=>$project_id],['company','seo_plan']);  
119 - $seo_plan = ($projectModel::seoMap()[$projectInfo['seo_plan']]) ?? '无选择'; 119 + $company = $projectModel->getValue(['id'=>$project_id],'company');
  120 + $deployModel = new DeployBuild();
  121 + $seo_plan = $deployModel->getValue(['project_id'=>$project_id],'seo_plan');
  122 + $seo_plan_name = ($projectModel::seoMap()[$seo_plan]) ?? '无选择';
120 $content_array = [ 123 $content_array = [
121 - 'title' => "【{$projectInfo['company']} {$seo_plan}】".self::typeMapping()[$data->type], 124 + 'title' => "【{$company} {$seo_plan_name}】".self::typeMapping()[$data->type],
122 'desc' => self::typeDesc()[$data->type], 125 'desc' => self::typeDesc()[$data->type],
123 'size' => 0, 126 'size' => 0,
124 'thumbSize' => 0, 127 'thumbSize' => 0,
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 namespace App\Models\Geo; 8 namespace App\Models\Geo;
9 9
10 use App\Models\Base; 10 use App\Models\Base;
  11 +use App\Models\Project\DeployBuild;
11 use App\Models\Project\Project; 12 use App\Models\Project\Project;
12 use App\Models\ProjectAssociation\ProjectAssociation; 13 use App\Models\ProjectAssociation\ProjectAssociation;
13 use App\Models\Workchat\MessagePush; 14 use App\Models\Workchat\MessagePush;
@@ -92,11 +93,13 @@ class GeoWritings extends Base @@ -92,11 +93,13 @@ class GeoWritings extends Base
92 'send_at' => time() 93 'send_at' => time()
93 ]; 94 ];
94 $projectModel = new Project(); 95 $projectModel = new Project();
95 - $projectInfo = $projectModel->read(['id'=>$project_id],['company','seo_plan']);  
96 - $seo_plan = ($projectModel::seoMap()[$projectInfo['seo_plan']]) ?? '无选择'; 96 + $company = $projectModel->getValue(['id'=>$project_id],'company');
  97 + $deployModel = new DeployBuild();
  98 + $seo_plan = $deployModel->getValue(['project_id'=>$project_id],'seo_plan');
  99 + $seo_plan_name = ($projectModel::seoMap()[$seo_plan]) ?? '无选择';
97 $token = Crypt::encrypt($param); 100 $token = Crypt::encrypt($param);
98 $content_array = [ 101 $content_array = [
99 - 'title' => "【{$projectInfo['company']} {$seo_plan}】核心文章已整理，请查看并确认", 102 + 'title' => "【{$company} {$seo_plan_name}】核心文章已整理，请查看并确认",
100 'desc' => '需选择确认10篇文章，后续根据您确认的文章进行外链发布。', 103 'desc' => '需选择确认10篇文章，后续根据您确认的文章进行外链发布。',
101 'size' => 0, 104 'size' => 0,
102 'thumbSize' => 0, 105 'thumbSize' => 0,