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

Lyh server



查看合并请求 !2771

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