作者 赵彬吉

update

@@ -83,16 +83,16 @@ class InquiryLogic extends BaseLogic @@ -83,16 +83,16 @@ class InquiryLogic extends BaseLogic
83 $page = $this->request['page'] ?: 1; 83 $page = $this->request['page'] ?: 1;
84 $form_id = $this->request['form_id'] ?? ''; 84 $form_id = $this->request['form_id'] ?? '';
85 $field = InquiryForm::getField($form_id); 85 $field = InquiryForm::getField($form_id);
86 - $map = [  
87 - 'form_id' => $form_id  
88 - ];  
89 - if($search){  
90 - foreach ($field as $v){  
91 - $map['data->' . $v] = $search;  
92 - }  
93 - }  
94 $fields = ['id', 'data', 'ip', 'country', 'domain', DB::raw('referer as refer'), DB::raw('status as read_status'), DB::raw('submit_at as submit_time')]; 86 $fields = ['id', 'data', 'ip', 'country', 'domain', DB::raw('referer as refer'), DB::raw('status as read_status'), DB::raw('submit_at as submit_time')];
95 - $lists = InquiryFormData::select($fields)->orderBy('id', 'desc')->paginate($page_size, ['*'], 'page', $page); 87 + $lists = InquiryFormData::where('form_id', $form_id)
  88 + ->where(function ($query) use ($search, $field){
  89 + if($search){
  90 + foreach ($field as $v){
  91 + $query->orWhere('data->' . $v, $search);
  92 + }
  93 + }
  94 + })
  95 + ->select($fields)->orderBy('id', 'desc')->paginate($page_size, ['*'], 'page', $page);
96 $data = $lists->toArray(); 96 $data = $lists->toArray();
97 97
98 return $this->success($data); 98 return $this->success($data);