合并分支 'akun' 到 'master'

Akun



查看合并请求 !1587

@@ -43,14 +43,17 @@ class ProjectCountryController extends BaseController
     public function custom_save(DomainInfoLogic $domainInfoLogic){
     public function custom_save(DomainInfoLogic $domainInfoLogic){
         $this->request->validate([
         $this->request->validate([
             'language_id'=>'required',
             'language_id'=>'required',
-            'custom_domain'=>'required',
             'is_create'=>'required'
             'is_create'=>'required'
         ],[
         ],[
             'language_id.required' => 'language_id不能为空',
             'language_id.required' => 'language_id不能为空',
-            'custom_domain.required' => 'custom_domain不能为空',
             'is_create.required' => 'is_create不能为空'
             'is_create.required' => 'is_create不能为空'
         ]);
         ]);
-        $domainInfoLogic->country_custom($this->user['project_id']);
+        if(isset($this->param['custom_domain']) && $this->param['custom_domain']){
+            $domainInfoLogic->country_custom($this->user['project_id']);
+        }else{
+            $projectCountryLogic = new ProjectCountryLogic();
+            $projectCountryLogic->country_custom_del();
+        }
         $this->response('success');
         $this->response('success');
     }
     }