diff --git a/src/app/model/system/Menu.php b/src/app/model/system/Menu.php index 1efda9dc3..c6d625e87 100644 --- a/src/app/model/system/Menu.php +++ b/src/app/model/system/Menu.php @@ -38,7 +38,7 @@ class Menu extends BaseModel // if (!empty($cache)) { // return $this->success($cache); // } - $list = model('menu')->getList($condition, $field, $order, '', '', '', $limit); + $list = model('menu')->getList($condition, $field, $order, '', [], '', $limit); // Cache::tag("menu")->set("getMenuList_" . $data, $list); return $this->success($list); diff --git a/src/app/shop/controller/BaseShop.php b/src/app/shop/controller/BaseShop.php index a502904c7..d4611637e 100644 --- a/src/app/shop/controller/BaseShop.php +++ b/src/app/shop/controller/BaseShop.php @@ -197,6 +197,14 @@ class BaseShop extends Controller $where[] = ['id','<>',2498]; $where1[] = ['id','<>',2498]; } + if($this->site_id != 2230){ + $where[] = ['id','<>',2651]; + $where1[] = ['id','<>',2651]; + } + if($this->site_id != 2558){ + $where[] = ['id','<>',2657]; + $where1[] = ['id','<>',2657]; + } if ($this->user_info[ 'is_admin' ] || $this->group_info[ 'is_system' ] == 1) { $menus = $menu_model->getMenuList($where, $field, 'level asc,sort asc'); } else {