Explorar o código

宁煤视频列表修改

任敬轩 %!s(int64=2) %!d(string=hai) anos
pai
achega
19248aa8df

+ 1 - 2
Modules/Mine/Http/Controllers/Api/MineApiController.php

@@ -44,8 +44,7 @@ class MineApiController extends BaseController
     public function getAreaList()
     {
         $mine_code = Input::get('mine_code', '');
-        $type = Input::get('type', '');
-        $result = MineServices::getAreaList($mine_code,$type);
+        $result = MineServices::getAreaList($mine_code);
 
 //        foreach ($result['data'] as $key => $val) {
             //分矿区判断是否使用海康视频服务器

+ 3 - 2
Modules/Mine/Services/MineServices.php

@@ -66,7 +66,7 @@ class MineServices{
     }
 
     //获取矿区列表
-    public static function getAreaList($mine_code = '',$type = '')
+    public static function getAreaList($mine_code = '')
     {
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
@@ -99,7 +99,8 @@ class MineServices{
                 $result['data'] = $mine_one;
             } else {
                 $mine_one = [];
-                if($type == 'ningmei'){//获取宁煤子区域列表
+                $con = explode('jituan',$mine_code);
+                if(count($con) > 1){//获取宁煤子区域列表
                     $mine_id = MineList::where('slug', 'like', '%' . $mine_code . '%')->where('parent_id',968)->value('id');
                     foreach ($mine_list as $key => $val) {
                         if (isset($val['children'])) {