Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into master-server

@@ -232,6 +232,7 @@ class AdsController extends BaseController
         $form_id = intval($request->input('form_id'));
         $form_id = intval($request->input('form_id'));
         $country = intval($request->input('country'));
         $country = intval($request->input('country'));
         $page_size = intval($request->input('row', '20'));
         $page_size = intval($request->input('row', '20'));
+        $domain = trim($request->input('domain', ''));
         $result = ReInquiryDetail::with('detailLog')
         $result = ReInquiryDetail::with('detailLog')
             ->when($status, function ($query, $status) {
             ->when($status, function ($query, $status) {
                 return $query->where('status', $status);
                 return $query->where('status', $status);
@@ -245,6 +246,9 @@ class AdsController extends BaseController
             ->when($country, function ($query, $country) {
             ->when($country, function ($query, $country) {
                 return $query->where('country', 'like', '%'.$country.'%');
                 return $query->where('country', 'like', '%'.$country.'%');
             })
             })
+            ->when($domain, function ($query, $domain) {
+                return $query->where('re_website', 'like', '%'.$domain.'%');
+            })
             ->orderBy('id', 'desc')
             ->orderBy('id', 'desc')
             ->paginate($page_size);
             ->paginate($page_size);
         return $this->response('success', Code::SUCCESS, $result);
         return $this->response('success', Code::SUCCESS, $result);
@@ -275,7 +279,18 @@ class AdsController extends BaseController
 
 
         foreach ($result as &$item){
         foreach ($result as &$item){
             $item->tasks = $item->tasks; //调用访问器
             $item->tasks = $item->tasks; //调用访问器
-            $item['project_id'] = DomainInfo::where('domain', $item['domain'])->value('project_id') ?: 0;
+            $is_v6 = 0;
+            foreach ($item->tasks as $task){
+                if($task['is_v6']){
+                    $is_v6 = 1;
+                }
+            }
+            if($is_v6){
+                $item['project_id'] = DomainInfo::where('domain', $item['domain'])->value('project_id') ?: 0;
+            }else{
+                $item['project_id'] = 0;
+            }
+
         }
         }
 
 
         return $this->response('success', Code::SUCCESS, $result);
         return $this->response('success', Code::SUCCESS, $result);