|
|
@@ -704,6 +704,7 @@ class SportsfootController extends Controller {
|
|
|
} else {
|
|
|
if(is_numeric($home_team)){
|
|
|
$where[] = array('st_zq_result.match_id', '=', $home_team);
|
|
|
+ $orwhere[] = 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);
|
|
|
@@ -714,18 +715,18 @@ class SportsfootController extends Controller {
|
|
|
$where[] = array('st_zq_result.status', '=', $status);
|
|
|
$orwhere[] = array('st_zq_result.status', '=', $status);
|
|
|
}
|
|
|
- if(!is_numeric($home_team)){
|
|
|
- if (!empty($star_time)) {
|
|
|
- $star_time = date('Y-m-d H:i:s', strtotime($star_time));
|
|
|
- $where[] = array('st_zq_result.start_time', '>', $star_time);
|
|
|
- $orwhere[] = array('st_zq_result.start_time', '>', $star_time);
|
|
|
- }
|
|
|
- if (!empty($end_time)) {
|
|
|
- $end_time = date('Y-m-d H:i:s', strtotime($end_time));
|
|
|
- $where[] = array('st_zq_result.start_time', '<', $end_time);
|
|
|
- $orwhere[] = array('st_zq_result.start_time', '<', $end_time);
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+ if (!empty($star_time)) {
|
|
|
+ $star_time = date('Y-m-d H:i:s', strtotime($star_time));
|
|
|
+ $where[] = array('st_zq_result.start_time', '>', $star_time);
|
|
|
+ $orwhere[] = array('st_zq_result.start_time', '>', $star_time);
|
|
|
+ }
|
|
|
+ if (!empty($end_time)) {
|
|
|
+ $end_time = date('Y-m-d H:i:s', strtotime($end_time));
|
|
|
+ $where[] = array('st_zq_result.start_time', '<', $end_time);
|
|
|
+ $orwhere[] = array('st_zq_result.start_time', '<', $end_time);
|
|
|
+ }
|
|
|
+
|
|
|
$newapp = new \App\Models\Stzqresult();
|
|
|
$data = $newapp->resultlist($list, $page, $where, $orwhere);
|
|
|
|