|
| xqd
@@ -61,12 +61,12 @@ class AdminAccessModel extends BaseModel
|
|
|
->leftJoin('admin_menus', 'admin_access.menu_id', '=', 'admin_menus.id')
|
|
|
->leftjoin("admin_roles","admin_access.role_id","=","admin_roles.id")
|
|
|
->whereIn('role_id',$roleIds)
|
|
|
- ->where("fanyun_admin_roles.status",1);
|
|
|
+ ->where("admin_roles.status",1);
|
|
|
if($isMenu) {
|
|
|
- $info = $info->where("fanyun_admin_menus.display",1);
|
|
|
+ $info = $info->where("admin_menus.display",1);
|
|
|
}
|
|
|
$info = $info
|
|
|
- ->orderBy('fanyun_admin_menus.sort', 'desc')->orderBy('fanyun_admin_menus.id', 'asc')
|
|
|
+ ->orderBy('admin_menus.sort', 'desc')->orderBy('admin_menus.id', 'asc')
|
|
|
->groupby(\DB::raw("fanyun_admin_menus.id"))
|
|
|
->get();
|
|
|
return $info->toArray();
|
