Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -162,7 +162,7 @@ class UpdateSeoTdk extends Command
 
 
     public function seo_tdk($project_id)
     public function seo_tdk($project_id)
     {
     {
-        $ai_commands = AiCommand::select('key', 'scene', 'ai')->get()->toArray();
+        $ai_commands = AiCommand::where('is_batch', 1)->select('key', 'scene', 'ai')->get()->toArray();
         $ai_commands = Arr::setValueToKey($ai_commands, 'key');
         $ai_commands = Arr::setValueToKey($ai_commands, 'key');
 
 
         foreach ($this->maps as $table => $map) {
         foreach ($this->maps as $table => $map) {

@@ -571,7 +571,8 @@ class ProjectController extends BaseController
      * @date 2023/9/11
      * @date 2023/9/11
      */
      */
     public function getProjectByChannel(){
     public function getProjectByChannel(){
-        $id = $this->param['id'] ?? [];
+        $id = $this->param['id'] ?? '';
+        $notice_order_id = $this->param['notice_order_id'] ?? '';
         $source_id = $this->param['channel_id'] ?? 0; //原系统渠道id
         $source_id = $this->param['channel_id'] ?? 0; //原系统渠道id
         $size = $this->param['page_size'] ?? 20;
         $size = $this->param['page_size'] ?? 20;
         $type = $this->param['type'] ?? '';
         $type = $this->param['type'] ?? '';
@@ -595,10 +596,15 @@ class ProjectController extends BaseController
                 $id = explode(',', $id);
                 $id = explode(',', $id);
             }
             }
         }
         }
+        if ($notice_order_id){
+            if(!is_array($notice_order_id)){
+                $notice_order_id = explode(',', $notice_order_id);
+            }
+        }
 
 
         $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check'])
         $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check'])
             ->where('delete_status', 0)
             ->where('delete_status', 0)
-            ->where(function ($query) use ($channel_id, $type, $company, $id){
+            ->where(function ($query) use ($channel_id, $type, $company, $id, $notice_order_id){
             if ($channel_id) {
             if ($channel_id) {
                 $query->where('channel->channel_id', $channel_id);
                 $query->where('channel->channel_id', $channel_id);
             }
             }
@@ -611,6 +617,9 @@ class ProjectController extends BaseController
             if ($id) {
             if ($id) {
                 $query->whereIn('id', $id);
                 $query->whereIn('id', $id);
             }
             }
+            if ($notice_order_id) {
+                $query->whereIn('notice_order_id', $notice_order_id);
+            }
         })->orderBy('id', 'desc')->paginate($size)->toArray();
         })->orderBy('id', 'desc')->paginate($size)->toArray();
         $list = [];
         $list = [];
         foreach ($data['list'] as $item){
         foreach ($data['list'] as $item){