Jonlin 6 anni fa
parent
commit
213bfd22eb

+ 3 - 3
app/Http/Controllers/Admin/BaseLeagueController.php

@@ -19,7 +19,7 @@ class BaseLeagueController extends Controller {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
         $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
-        $request['id'] = isset($req->id) ? trim($req->id) : '';
+        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
@@ -31,7 +31,7 @@ class BaseLeagueController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/BaseLeague/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
+        $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('area', array('sort' => false, 'width' => 180));
         $dt->addColsFields('country', array('sort' => true, 'width' => 180));
@@ -145,7 +145,7 @@ class BaseLeagueController extends Controller {
             if (!$areas) {
                 return -2;
             }
-            $data = \App\Models\BaseLeague::where('id',$id)->first();
+            $data = \App\Models\BaseLeague::where('lg_id',$id)->first();
             $areaname = \App\Models\StAreaCountry::where('id',$data->area_id)->first();
             $countryname = \App\Models\StAreaCountry::where('id',$data->country_id)->first();
             if(!empty($areaname)){

+ 3 - 3
app/Http/Controllers/Admin/BasketLeagueController.php

@@ -19,7 +19,7 @@ class BasketLeagueController extends Controller {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
         $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
-        $request['id'] = isset($req->id) ? trim($req->id) : '';
+        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
@@ -31,7 +31,7 @@ class BasketLeagueController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/BasketLeague/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
+        $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('area', array('sort' => false, 'width' => 180));
         $dt->addColsFields('country', array('sort' => true, 'width' => 180));
@@ -145,7 +145,7 @@ class BasketLeagueController extends Controller {
             if (!$areas) {
                 return -2;
             }
-            $data = \App\Models\BasketLeague::where('id',$id)->first();
+            $data = \App\Models\BasketLeague::where('lg_id',$id)->first();
             $areaname = \App\Models\StAreaCountry::where('id',$data->area_id)->first();
             $countryname = \App\Models\StAreaCountry::where('id',$data->country_id)->first();
             if(!empty($areaname)){

+ 3 - 3
app/Http/Controllers/Admin/TennisLeagueController.php

@@ -19,7 +19,7 @@ class TennisLeagueController extends Controller {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
         $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
-        $request['id'] = isset($req->id) ? trim($req->id) : '';
+        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\SoccerLeague::select('id','lg_id','name_chinese')->get();
@@ -31,7 +31,7 @@ class TennisLeagueController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/TennisLeague/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
+        $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('area', array('sort' => false, 'width' => 180));
         $dt->addColsFields('country', array('sort' => true, 'width' => 180));
@@ -146,7 +146,7 @@ class TennisLeagueController extends Controller {
             if (!$areas) {
                 return -2;
             }
-            $data = \App\Models\TennisLeague::where('id',$id)->first();
+            $data = \App\Models\TennisLeague::where('lg_id',$id)->first();
             $areaname = \App\Models\StAreaCountry::where('id',$data->area_id)->first();
             $countryname = \App\Models\StAreaCountry::where('id',$data->country_id)->first();
             if(!empty($areaname)){

+ 8 - 8
app/Models/BaseLeague.php

@@ -12,21 +12,21 @@ class BaseLeague extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '')
     {
-        $source = \App\Models\Setinfo::where('id','1000')->first();
-        if($source->infocontent != '混合数据'){
-            $where[] = array('st_bq_local_league.source', '=', $source->infocontent);
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $where[] = array('st_bq_local_league.source', '=', $source->infocontent);
+//        }
         if (is_array ($where) && count ($where) > 0){
             $data = $this
-                ->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
-                ->select('st_bq_league.id','st_bq_league.name_chinese','st_bq_league.area_id','st_bq_league.country_id','st_bq_league.status','st_bq_league.utime')
+                //->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
+                ->select('st_bq_league.id','st_bq_league.name_chinese','st_bq_league.area_id','st_bq_league.country_id','st_bq_league.utime')
                 ->orderby('st_bq_league.utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
-                ->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
-                ->select('st_bq_league.id','st_bq_league.name_chinese','st_bq_league.area_id','st_bq_league.country_id','st_bq_league.status','st_bq_league.utime')
+                //->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
+                ->select('st_bq_league.id','st_bq_league.name_chinese','st_bq_league.area_id','st_bq_league.country_id','st_bq_league.utime')
                 ->orderby('st_bq_league.utime','desc')
                 ->paginate ($list);
         }

+ 8 - 8
app/Models/BasketLeague.php

@@ -14,21 +14,21 @@ class BasketLeague extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '')
     {
-        $source = \App\Models\Setinfo::where('id','1000')->first();
-        if($source->infocontent != '混合数据'){
-            $where[] = array('st_lq_local_league.source', '=', $source->infocontent);
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $where[] = array('st_lq_local_league.source', '=', $source->infocontent);
+//        }
         if (is_array ($where) && count ($where) > 0){
             $data = $this
-                ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
-                ->select('st_lq_league.id','st_lq_league.name_chinese','st_lq_league.area_id','st_lq_league.country_id','st_lq_league.status','st_lq_league.utime')
+                //->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
+                ->select('st_lq_league.id','st_lq_league.name_chinese','st_lq_league.area_id','st_lq_league.country_id','st_lq_league.utime')
                 ->orderby('st_lq_league.utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
-                ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
-                ->select('st_lq_league.id','st_lq_league.name_chinese','st_lq_league.area_id','st_lq_league.country_id','st_lq_league.status','st_lq_league.utime')
+                //->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
+                ->select('st_lq_league.id','st_lq_league.name_chinese','st_lq_league.area_id','st_lq_league.country_id','st_lq_league.utime')
                 ->orderby('st_lq_league.utime','desc')
                 ->paginate ($list);
         }

+ 8 - 8
app/Models/TennisLeague.php

@@ -14,21 +14,21 @@ class TennisLeague extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '')
     {
-        $source = \App\Models\Setinfo::where('id','1000')->first();
-        if($source->infocontent != '混合数据'){
-            $where[] = array('st_wq_local_league.source', '=', $source->infocontent);
-        }
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $where[] = array('st_wq_local_league.source', '=', $source->infocontent);
+//        }
         if (is_array ($where) && count ($where) > 0){
             $data = $this
-                ->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
-                ->select('st_wq_league.id','st_wq_league.name_chinese','st_wq_league.area_id','st_wq_league.country_id','st_wq_league.status','st_wq_league.utime')
+                //->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
+                ->select('st_wq_league.id','st_wq_league.name_chinese','st_wq_league.area_id','st_wq_league.country_id','st_wq_league.utime')
                 ->orderby('st_wq_league.utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
-                ->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
-                ->select('st_wq_league.id','st_wq_league.name_chinese','st_wq_league.area_id','st_wq_league.country_id','st_wq_league.status','st_wq_league.utime')
+                //->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
+                ->select('st_wq_league.id','st_wq_league.name_chinese','st_wq_league.area_id','st_wq_league.country_id','st_wq_league.utime')
                 ->orderby('st_wq_league.utime','desc')
                 ->orderby('utime','desc')
                 ->paginate ($list);