gx

@@ -59,7 +59,7 @@ class MenuLogic extends  BaseLogic
 
 
     public function getAllMenu(){
     public function getAllMenu(){
         $map = [
         $map = [
-            'type' => Menu::TYPE_MENU,
+            'type' => 0,
             'status' => Menu::STATUS_NORMAL,
             'status' => Menu::STATUS_NORMAL,
         ];
         ];
         $lists = $this->model->list($map);
         $lists = $this->model->list($map);
@@ -84,6 +84,7 @@ class MenuLogic extends  BaseLogic
     public function getMenuByGroupId($gid){
     public function getMenuByGroupId($gid){
         $rights = Group::where(['id' => $gid, 'status' => Group::STATUS_NORMAL])->pluck('rights')->first();
         $rights = Group::where(['id' => $gid, 'status' => Group::STATUS_NORMAL])->pluck('rights')->first();
         $map = [
         $map = [
+            'type'=>0,
             'status' => Menu::STATUS_NORMAL,
             'status' => Menu::STATUS_NORMAL,
             'id'=>['in',$rights] ,
             'id'=>['in',$rights] ,
         ];
         ];

@@ -35,8 +35,8 @@ class MenuRequest extends FormRequest
             'title' => ['required', 'max:32'],
             'title' => ['required', 'max:32'],
             'icon' => ['max:32'],
             'icon' => ['max:32'],
             'route_name' => ['max:32'],
             'route_name' => ['max:32'],
-            'type' => ['required', Rule::in(array_keys(Menu::typeMap()))],
-            'status' => ['required', Rule::in(array_keys(Menu::statusMap()))],
+            'type' => ['required'],
+            'status' => ['required'],
         ];
         ];
     }
     }
 
 
@@ -49,9 +49,7 @@ class MenuRequest extends FormRequest
             'icon.max' => '图标长度不超过32个字符',
             'icon.max' => '图标长度不超过32个字符',
             'route_name.max' => '路由长度不超过32个字符',
             'route_name.max' => '路由长度不超过32个字符',
             'type.required' => '请选择类型',
             'type.required' => '请选择类型',
-            'type.in' => '类型值无效',
             'status.required' => '请选择状态',
             'status.required' => '请选择状态',
-            'status.in' => '状态值无效',
         ];
         ];
     }
     }