合并分支 'zhl' 到 'master'

Zhl



查看合并请求 !19

@@ -582,8 +582,8 @@ class ProjectController extends BaseController
         if(!$channel){
         if(!$channel){
             $this->response('渠道不存在',Code::SYSTEM_ERROR);
             $this->response('渠道不存在',Code::SYSTEM_ERROR);
         }
         }
-        if (empty($id) || FALSE == is_array($id))
-            $id = [];
+        if ($id && FALSE == is_array($id))
+            $id = explode(',', $id);
 
 
         $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check'])->where(['channel->channel_id' => $channel->id, 'delete_status' => 0])->where(function ($query) use ($type, $company, $id){
         $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check'])->where(['channel->channel_id' => $channel->id, 'delete_status' => 0])->where(function ($query) use ($type, $company, $id){
             if ($type) {
             if ($type) {