|
@@ -29,7 +29,7 @@ class Menu extends BaseController{
|
|
|
$MenuAction[$value['menuid']][]=$value;
|
|
|
}
|
|
|
$menuid= array_column($action,"menuid");
|
|
|
- $menuAll =Db::name("admin_menu")->where(["id"=>$menuid,"status"=>1])->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type");
|
|
|
+ $menuAll =Db::name("admin_menu")->where(["id"=>$menuid,"status"=>1])->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,status");
|
|
|
$list=[];
|
|
|
foreach ($menuAll as $value){
|
|
|
$value['action'][]=$MenuAction[$value['id']];
|
|
@@ -47,7 +47,7 @@ class Menu extends BaseController{
|
|
|
* @throws \think\exception\DbException
|
|
|
*/
|
|
|
public function MenuAllList(){
|
|
|
- $data = Db::name("admin_menu")->field("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type")->order("weight desc,id asc")->select();
|
|
|
+ $data = Db::name("admin_menu")->field("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,status")->order("weight desc,id asc")->select();
|
|
|
$l= MenuTree($data,0);
|
|
|
return app_show(0,"获取成功",$l);
|
|
|
}
|