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

Lyh server



查看合并请求 !2745

@@ -241,14 +241,15 @@ class FetchTicketProjects extends Command
                     //todo::建站或同时为v6版本+GEO的，建站中项目给项目经理
                     if(($status == 1) && ($item->deploy_build->plan > 0) && ($item->deploy_build->seo_plan > 0)){
                         $engineer_id = $pm_id; //找项目经理
-                    }elseif (($item->is_upgrade == 1) || ($item->project_type == 1)){
-                        $engineer_id = $assm_id; // V5升V6，白帽SEO，GEO,找售后服务经理
-                    }elseif ($status == 1){
-                        $engineer_id = $pm_id; // 建站中找项目经理
-                    }elseif ($status == 2){
-                        $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
                     }else{
-                        $engineer_id = $assm_id; // 推广找售后服务经理
+                        if ($item->is_upgrade || $item->project_type == 1 || $item->deploy_build->seo_plan > 0)
+                            $engineer_id = $assm_id; // V5升V6，白帽SEO，GEO,找售后服务经理
+                        elseif ($status == 1)
+                            $engineer_id = $pm_id; // 建站中找项目经理
+                        elseif ($status == 2)
+                            $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
+                        else
+                            $engineer_id = $assm_id; // 推广找售后服务经理
                     }
                     $is_del = (
                         $item->extend_type == 5

@@ -19,7 +19,7 @@ class TicketProject extends Base
     public function projectV6()
     {
         return $this->hasOne(Project::class, 'id', 'table_id')
-            ->select(['id', 'title', 'company', 'is_upgrade', 'project_type']);
+            ->select(['id', 'title', 'company', 'is_upgrade' ,'project_type']);
     }
 
     // 项目经理