gx

@@ -64,12 +64,29 @@ class MenuLogic extends  BaseLogic
         return $this->success(Arr::listToTree($list));
     }
 
+    /**
+     * @remark :获取当前用户用户的菜单列表
+     * @name   :getMenuByGroupId
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/25 10:21
+     */
     public function getMenuByGroupId($gid){
         $rights = Group::where(['id' => $gid, 'status' => Group::STATUS_NORMAL])->pluck('rights')->first();
-        $map[] = ['type' => Menu::TYPE_MENU];
-        $map[] = ['status' => Menu::STATUS_NORMAL];
-        $map[] = ['id', 'in', $rights];
-        $list = parent::getList($map, ['id' => 'desc'], ['id', 'pid', 'title', 'icon', 'type', 'menu_path'], 0);
-        return $this->success(Arr::listToTree($list));
+        $map = [
+            'type' => Menu::TYPE_MENU,
+            'status' => Menu::STATUS_NORMAL,
+            'id'=>['in',$rights] ,
+        ];
+        $lists = $this->model->list($map);
+        $menu = array();
+        foreach ($lists as $k => $v){
+            $v = (array)$v;
+            if ($v['pid'] == 0) {
+                $v['sub'] = _get_child($v['id'], $lists);
+                $menu[]   = $v;
+            }
+        }
+        return $this->success($menu);
     }
 }