|
@@ -28,21 +28,35 @@ class NavController extends BaseController |
|
@@ -28,21 +28,35 @@ class NavController extends BaseController |
|
28
|
* @method :post
|
28
|
* @method :post
|
|
29
|
* @time :2023/12/4 15:00
|
29
|
* @time :2023/12/4 15:00
|
|
30
|
*/
|
30
|
*/
|
|
31
|
- public function index(BNav $nav){
|
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
|
$lists = $nav->list($this->map,$this->order = ['sort','id']);
|
33
|
$lists = $nav->list($this->map,$this->order = ['sort','id']);
|
|
34
|
- $data = array();
|
|
|
|
35
|
- foreach ($lists as $v){
|
|
|
|
36
|
- $v = (array)$v;
|
|
|
|
37
|
- if ($v['pid'] == 0) {
|
|
|
|
38
|
- $v['sub'] = _get_child($v['id'], $lists);
|
|
|
|
39
|
- $data[] = $v;
|
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
|
+ foreach ($sort_list as $k => $v){
|
|
|
|
39
|
+ if(isset($v['sub']) && !empty($v['sub'])){
|
|
|
|
40
|
+
|
|
|
|
41
|
+ }
|
|
|
|
42
|
+
|
|
|
|
43
|
+ }
|
|
|
|
44
|
+ }else{
|
|
|
|
45
|
+ $data = array();
|
|
|
|
46
|
+ foreach ($lists as $v){
|
|
|
|
47
|
+ $v = (array)$v;
|
|
|
|
48
|
+ if ($v['pid'] == 0) {
|
|
|
|
49
|
+ $v['sub'] = _get_child($v['id'], $lists);
|
|
|
|
50
|
+ $data[] = $v;
|
|
|
|
51
|
+ }
|
|
40
|
}
|
52
|
}
|
|
41
|
}
|
53
|
}
|
|
42
|
$this->response('success',Code::SUCCESS,$data);
|
54
|
$this->response('success',Code::SUCCESS,$data);
|
|
43
|
}
|
55
|
}
|
|
44
|
|
56
|
|
|
|
|
57
|
+ public function getNavList(){
|
|
45
|
|
58
|
|
|
|
|
59
|
+ }
|
|
46
|
|
60
|
|
|
47
|
/**
|
61
|
/**
|
|
48
|
* @remark :获取当前id下的所有子集
|
62
|
* @remark :获取当前id下的所有子集
|