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

列表页聚合页模式



查看合并请求 !2477

@@ -962,7 +962,13 @@ class ProjectLogic extends BaseLogic
                 if($param['zone_id'] != 0){
                 if($param['zone_id'] != 0){
                     $map['zone_id'] = $param['zone_id'];
                     $map['zone_id'] = $param['zone_id'];
                 }
                 }
-                return Channel::where($map)->pluck('alias', 'id')->toArray();
+                $channelData = [];
+                $chanelModel = new Channel();
+                $channelList = $chanelModel->list($map,'id',['id','title','alias']);
+                foreach ($channelList as $item){
+                    $channelData[$item['id']] = $item['title'].'-'.$item['alias'];
+                }
+                return $channelData;
             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();
         }
         }