gx

@@ -28,18 +28,9 @@ class ProjectMenuController extends BaseController
      * @method :post
      * @time   :2023/6/21 17:24
      */
-    public function lists(){
-        $menuModel = new ProjectMenuModel();
-        $lists = $menuModel->lists($this->map,$this->page,$this->row,$this->order);
-        $menu = array();
-        foreach ($lists['list'] as $k => $v){
-            $v = (array)$v;
-            if ($v['pid'] == 0) {
-                $v['sub'] = _get_child($v['id'], $lists['list']);
-                $menu[]   = $v;
-            }
-        }
-        $this->response('success',Code::SUCCESS,$menu);
+    public function lists(ProjectMenuLogic $projectMenuLogic){
+        $lists = $projectMenuLogic->MenuList();
+        $this->response('success',Code::SUCCESS,$lists);
     }
 
     /**

@@ -92,8 +92,16 @@ class ProjectMenuLogic extends BaseLogic
      * @time   :2023/6/21 17:26
      */
     public function MenuList(){
-        $lists = $this->model->list(['status'=>$this->model::ZERO,'is_role'=>$this->model::ZERO,'pid'=>$this->model::ZERO],'created_at');
-        return $this->success($lists);
+        $lists = $this->model->list(['status'=>$this->model::ZERO],'created_at');
+        $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);
     }
 
     /**