合并分支 'zhl' 到 'master'

Zhl



查看合并请求 !17

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