作者 lyh

gx

@@ -32,11 +32,11 @@ class NavController extends BaseController @@ -32,11 +32,11 @@ class NavController extends BaseController
32 $this->map['project_id'] = $this->user['project_id']; 32 $this->map['project_id'] = $this->user['project_id'];
33 $lists = $nav->list($this->map,$this->order = ['sort','id']); 33 $lists = $nav->list($this->map,$this->order = ['sort','id']);
34 //获取菜单组排序字段 34 //获取菜单组排序字段
35 -// $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);  
36 -// if(!empty($groupInfo['sort_list'])){  
37 -// $sort_list = json_decode($groupInfo['sort_list']);  
38 -// $data = $this->findDetailsList($sort_list,$lists);  
39 -// }else{ 35 + $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
  36 + if(!empty($groupInfo['sort_list'])){
  37 + $sort_list = json_decode($groupInfo['sort_list']);
  38 + $data = $this->findDetailsList($sort_list,$lists);
  39 + }else{
40 $data = array(); 40 $data = array();
41 foreach ($lists as $v){ 41 foreach ($lists as $v){
42 $v = (array)$v; 42 $v = (array)$v;
@@ -45,7 +45,7 @@ class NavController extends BaseController @@ -45,7 +45,7 @@ class NavController extends BaseController
45 $data[] = $v; 45 $data[] = $v;
46 } 46 }
47 } 47 }
48 -// } 48 + }
49 $this->response('success',Code::SUCCESS,$data); 49 $this->response('success',Code::SUCCESS,$data);
50 } 50 }
51 51