|
...
|
...
|
@@ -32,11 +32,11 @@ class NavController extends BaseController |
|
|
|
$this->map['project_id'] = $this->user['project_id'];
|
|
|
|
$lists = $nav->list($this->map,$this->order = ['sort','id']);
|
|
|
|
//获取菜单组排序字段
|
|
|
|
// $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
|
|
|
|
// if(!empty($groupInfo['sort_list'])){
|
|
|
|
// $sort_list = json_decode($groupInfo['sort_list']);
|
|
|
|
// $data = $this->findDetailsList($sort_list,$lists);
|
|
|
|
// }else{
|
|
|
|
$groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
|
|
|
|
if(!empty($groupInfo['sort_list'])){
|
|
|
|
$sort_list = json_decode($groupInfo['sort_list']);
|
|
|
|
$data = $this->findDetailsList($sort_list,$lists);
|
|
|
|
}else{
|
|
|
|
$data = array();
|
|
|
|
foreach ($lists as $v){
|
|
|
|
$v = (array)$v;
|
|
...
|
...
|
@@ -45,7 +45,7 @@ class NavController extends BaseController |
|
|
|
$data[] = $v;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
$this->response('success',Code::SUCCESS,$data);
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|