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

gxshuju



查看合并请求 !1405

@@ -62,7 +62,9 @@ class CopyProject extends Command
                     $this->copyPayment($old_project_id,$project_id);
                     $this->copyPayment($old_project_id,$project_id);
                     $this->copyAfter($old_project_id,$project_id);
                     $this->copyAfter($old_project_id,$project_id);
                     $this->copyUser($old_project_id,$project_id);
                     $this->copyUser($old_project_id,$project_id);
-                    $this->copyMysql($old_project_id,$project_id);
+                    if($type != 0){
+                        $this->copyMysql($old_project_id,$project_id);
+                    }
                     //修改项目状态
                     //修改项目状态
                     $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);
                     $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);
                     $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);
                     $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);