33333

app/Services/MenuService.php

@@ -173,9 +173,11 @@ class MenuService extends BaseService
             }
             $list = $allMenus;
         }
-
-        // $tree = self::toTree($list,0,0,'parent_id');
-        $tree = self::buildTree($list,'parent_id');
+        if($type == 1){
+            $tree = self::toTree($list,0,0,'parent_id');
+        }else{
+            $tree = $list;
+        }
         return $tree;
     }