|
@@ -35,7 +35,7 @@ class Menu extends BaseController{
|
|
|
|
|
|
$menuid= array_column($action,"menuid");
|
|
|
$menuAll =Db::name("admin_menu")->where(["id"=>$menuid,"status"=>1,"is_del"=>0])->where("level",">=",
|
|
|
- $this->level)->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,status,weight");
|
|
|
+ $this->level)->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,level,status,weight");
|
|
|
$list=[];
|
|
|
foreach ($menuAll as $value){
|
|
|
$value['action']=$MenuAction[$value['id']];
|
|
@@ -58,7 +58,7 @@ class Menu extends BaseController{
|
|
|
if($role==false){
|
|
|
return app_show(0,"获取成功",[]);
|
|
|
}
|
|
|
- $data = Db::name("admin_menu")->where([["is_del","=",0],["level",">=",$this->level]])->field("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,status,weight")->order("weight desc,id asc")->select();
|
|
|
+ $data = Db::name("admin_menu")->where([["is_del","=",0],["level",">=",$this->level]])->field("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,level,status,weight")->order("weight desc,id asc")->select();
|
|
|
$l= MenuTree($data,0);
|
|
|
return app_show(0,"获取成功",$l);
|
|
|
}
|