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

Lyh server



查看合并请求 !2963

@@ -218,9 +218,6 @@ class CopyProject extends Command
         ProjectServer::createDatabase($project);
         ProjectServer::createDatabase($project);
         //创建表
         //创建表
         $this->initTable($project_id,$new_project_id);
         $this->initTable($project_id,$new_project_id);
-        //修改项目状态
-        $projectModel = new Project();
-        $projectModel->edit(['delete_status'=>0],['id'=>$new_project_id]);
     }
     }
 
 
     /**
     /**

@@ -237,7 +237,7 @@ class CNoticeController extends BaseController
             $this->fail('未查询到项目数据');
             $this->fail('未查询到项目数据');
         }
         }
         // --------------------------------------------------- 特殊处理通知生成页面 --------------------------------------------------------------
         // --------------------------------------------------- 特殊处理通知生成页面 --------------------------------------------------------------
-        if ($type == 2 && ($project_id != 4041) && ($project_info['main_lang_id'] == 8)) {
+        if ($type == 2 && ($project_id != 4041) && ($project_id != 4094) && ($project_info['main_lang_id'] == 8)) {
             $this->fail('申请项目主语种为俄语，禁止翻译小语种，如若需要翻译小语种， 请联系售后人员确认！');
             $this->fail('申请项目主语种为俄语，禁止翻译小语种，如若需要翻译小语种， 请联系售后人员确认！');
         }
         }