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

渠道设置修改



查看合并请求 !644

@@ -88,10 +88,7 @@ class AyrReleaseController extends BaseController
         }
         }
         //发送请求发布社交文章
         //发送请求发布社交文章
         $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
         $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
-        //保存数据库
-        if($res){
-            $ayrReleaseLogic->release_add($res);
-        }
+        $ayrReleaseLogic->release_add($res);
         //保存返回的内容
         //保存返回的内容
         $this->response('success',Code::SUCCESS,json_decode($res));
         $this->response('success',Code::SUCCESS,json_decode($res));
     }
     }

@@ -637,12 +637,21 @@ class ProjectLogic extends BaseLogic
     public function channelSource($param){
     public function channelSource($param){
         switch ($param['type']){
         switch ($param['type']){
             case Project::TYPE_ONE:
             case Project::TYPE_ONE:
-                return Zone::pluck('title', 'id')->toArray();
+                $data = [0=>'所有'];
+                $list = (new Zone())->list([],'id',['id','title'],'asc');
+                foreach ($list as $v){
+                    $data[$v['id']] = $v['title'];
+                }
+                return $data;
             case Project::TYPE_TWO:
             case Project::TYPE_TWO:
                 if(isset($param['alias'])){
                 if(isset($param['alias'])){
                     return Channel::where('alias', 'like' ,'%'.$param['alias'].'%')->pluck('alias', 'id')->toArray();
                     return Channel::where('alias', 'like' ,'%'.$param['alias'].'%')->pluck('alias', 'id')->toArray();
                 }
                 }
-                return Channel::where('zone_id', $param['zone_id']??0)->pluck('alias', 'id')->toArray();
+                $map = [];
+                if($param['zone_id'] != 0){
+                    $map['zone_id'] = $param['zone_id'];
+                }
+                return Channel::where($map)->pluck('alias', 'id')->toArray();
             case Project::TYPE_THREE:
             case Project::TYPE_THREE:
                 return User::where('channel_id', $param['channel_id']??0)->pluck('name', 'id')->toArray();
                 return User::where('channel_id', $param['channel_id']??0)->pluck('name', 'id')->toArray();
         }
         }

@@ -47,10 +47,7 @@ class AyrReleaseLogic extends BaseLogic
         $this->param['platforms'] = json_encode($this->param['platforms']);
         $this->param['platforms'] = json_encode($this->param['platforms']);
         $info = $this->model->read(['platforms'=>$this->param['platforms'],'operator_id'=>$this->param['operator_id'],'project_id'=>$this->param['project_id'],'title'=>$this->param['title']]);
         $info = $this->model->read(['platforms'=>$this->param['platforms'],'operator_id'=>$this->param['operator_id'],'project_id'=>$this->param['project_id'],'title'=>$this->param['title']]);
         if($info === false){
         if($info === false){
-            $rs = $this->model->add($this->param);
-            if($rs === false){
-                $this->fail('error');
-            }
+            $this->model->add($this->param);
         }
         }
         return $this->success();
         return $this->success();
     }
     }