周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 b82b82dd605311e05779a8f9fb62f88066eb68c6 2 个父辈 17d4580c 0d613b62

Merge remote-tracking branch 'origin/master' into akun

内嵌 并排对比
正在显示 3 个修改的文件 包含 3 行增加 和 3 行删除
@@ -1666,7 +1666,7 @@ class LyhImportTest extends Command @@ -1666,7 +1666,7 @@ class LyhImportTest extends Command
1666 $saveData = ['key'=>'pd_extended_field_1', 'type'=>4, 'values'=>json_encode([$item['href']],true), 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>5, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')]; 1666 $saveData = ['key'=>'pd_extended_field_1', 'type'=>4, 'values'=>json_encode([$item['href']],true), 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>5, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')];
1667 $customExtendContentTModel->add($saveData); 1667 $customExtendContentTModel->add($saveData);
1668 }else{ 1668 }else{
1669 - $saveData = ['key'=>'pd_extended_field_1', 'type'=>4, 'values'=>json_encode([$item['href']],true), 'content_id'=>$info['id'], 'project_id'=>$project_id, 'module_id'=>5, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')]; 1669 + $saveData = ['key'=>'pd_extended_field_1', 'type'=>4, 'values'=>json_encode([['name'=>$item['name'],'url'=>$item['href']]],true), 'content_id'=>$info['id'], 'project_id'=>$project_id, 'module_id'=>5, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')];
1670 $customExtendContentTModel->add($saveData); 1670 $customExtendContentTModel->add($saveData);
1671 } 1671 }
1672 } 1672 }
@@ -221,7 +221,7 @@ class TicketController extends BaseController @@ -221,7 +221,7 @@ class TicketController extends BaseController
221 $data['record'] = array_filter($data['record'], function($item) { 221 $data['record'] = array_filter($data['record'], function($item) {
222 return $item['date'] > '2025-09-01'; 222 return $item['date'] > '2025-09-01';
223 }); 223 });
224 - if($project['type'] == 2){ 224 + if($project['type'] == 2 || $project['deploy_build']['seo_plan'] > 0){
225 //优化项目 默认在seo优化中 225 //优化项目 默认在seo优化中
226 if($data['optimize_record'] == 0) { 226 if($data['optimize_record'] == 0) {
227 $data['optimize_record'] = 1; 227 $data['optimize_record'] = 1;
@@ -64,7 +64,7 @@ class ProcessRecordsLogic extends BaseLogic @@ -64,7 +64,7 @@ class ProcessRecordsLogic extends BaseLogic
64 // $data['record'] = array_filter($data['record'], function($item) { 64 // $data['record'] = array_filter($data['record'], function($item) {
65 // return $item['date'] > '2025-09-01'; 65 // return $item['date'] > '2025-09-01';
66 // }); 66 // });
67 - if($project['type'] == 2){ 67 + if($project['type'] == 2 || $project['deploy_build']['seo_plan'] > 0){
68 //优化项目 默认在seo优化中 68 //优化项目 默认在seo优化中
69 if($data['optimize_record'] == 0) { 69 if($data['optimize_record'] == 0) {
70 $data['optimize_record'] = 1; 70 $data['optimize_record'] = 1;