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