5 Commits ca4667af3e ... 03071c1d63

Author SHA1 Message Date
  Jimy 03071c1d63 upd 6 years ago
  Jimy ea3c63769d Merge branch 'master' 6 years ago
  Jimy 637d91f079 upd 6 years ago
  Jimy 79e757c52a Merge branch 'master' 6 years ago
  Jimy 7cc731bd26 upd 6 years ago
2 changed files with 9 additions and 8 deletions
  1. 7 6
      app/Http/Controllers/Admin/SportsfootController.php
  2. 2 2
      app/Models/Stzqresult.php

+ 7 - 6
app/Http/Controllers/Admin/SportsfootController.php

@@ -193,16 +193,17 @@ class SportsfootController extends Controller {
 
 		$where = array();
 		$orwhere = array();
-		$swhere = array();
 		if (!empty($home_team)) {
 			if (empty($sureblur) || $sureblur == 'off') {
 				$where[] = array('st_zq_result.home_team', 'like', '%' . $home_team . '%');
 				$orwhere[] = array('st_zq_result.guest_team', 'like', '%' . $home_team . '%');
-				$swhere[] = array('st_zq_result.match_id', 'like', '%' . $home_team . '%');
 			} else {
-				$where[] = array('st_zq_result.home_team', '=', $home_team);
-				$orwhere[] = array('st_zq_result.guest_team', '=', $home_team);
-				$swhere[] = array('st_zq_result.match_id', '=', $home_team);
+				if(is_numeric($home_team)){
+					$where[] = array('st_zq_result.match_id', '=', $home_team);
+				}else{
+					$where[] = array('st_zq_result.home_team', '=', $home_team);
+					$orwhere[] = array('st_zq_result.guest_team', '=', $home_team);
+				}
 			}
 		}
 		if ($status != -1) {
@@ -223,7 +224,7 @@ class SportsfootController extends Controller {
             $where[] = array('st_zq_result.start_time', '<', $end_time);
         }
         $newapp = new \App\Models\Stzqresult();
-        $data = $newapp->resultlist($list, $page, $where, $orwhere,$swhere);
+        $data = $newapp->resultlist($list, $page, $where, $orwhere);
         
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
     }

+ 2 - 2
app/Models/Stzqresult.php

@@ -8,10 +8,10 @@ class Stzqresult extends BaseModel
 	public $timestamps = false;
     protected $fillable = ['id','lg_id','home_team','guest_team','home_rate','guest_rate','home_score','status','first_score','last_score','match_score','guest_score','match_winer','update_time','match_time','match_process','tag','u_home_score','u_guest_score','match_id','all_goal','penalty_card','corner_ball','source','p_code'];
 
-    function resultlist($list = 10, $page, $where = '',$orwhere = '',$swhere = '')
+    function resultlist($list = 10, $page, $where = '',$orwhere = '')
     {
         if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.lg_id')->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.start_time',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->where($where)->orwhere($orwhere)->orwhere($swhere)->paginate ($list);
+            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.lg_id')->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.start_time',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
         } else { 
             $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.lg_id')->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.start_time',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->paginate ($list);
         }