|
|
@@ -19,7 +19,7 @@ class Menu extends BaseController{
|
|
|
public function MenuList(){
|
|
|
$condition =["status"=>1,"is_del"=>0];
|
|
|
if($this->level=='') return app_show(101,"账户角色已禁用",[]);
|
|
|
- if ($this->roleid!=1){
|
|
|
+ if ($this->level!=1){
|
|
|
$role = Db::name("role_action")->where("role_id","=",$this->roleid)->find();
|
|
|
|
|
|
if($role==false){
|
|
|
@@ -47,7 +47,7 @@ class Menu extends BaseController{
|
|
|
|
|
|
$menuAll =Db::name("admin_menu")
|
|
|
->where($condition)
|
|
|
-// ->where("level",">=",$this->level)
|
|
|
+ ->where("level",">=",$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){
|
