gx

@@ -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 array_push(Zone::pluck('title', 'id')->toArray(),[5,'所有']);
+                $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();
         }
         }