|
|
@@ -17,6 +17,7 @@ use App\Services\RoleMenuService;
|
|
|
*/
|
|
|
class MenuService extends BaseService
|
|
|
{
|
|
|
+ public static string $MODEL = Menu::class;
|
|
|
/**
|
|
|
* @description: 模型
|
|
|
* @return {string}
|
|
|
@@ -157,13 +158,13 @@ class MenuService extends BaseService
|
|
|
{
|
|
|
// 超级管理账号直接查看所有的菜单
|
|
|
if($userId == 1){
|
|
|
- $list = self::findAll(['type' => $type ,'status' => self::model()::STATUS_SHOW]);
|
|
|
+ $list = self::findAll(['type' => $type ,'status' => self::$MODEL::STATUS_SHOW]);
|
|
|
}else{
|
|
|
- $roleIds = RoleUserService::model()::where('user_id',$userId)->pluck('role_id')->toArray();
|
|
|
+ $roleIds = RoleUserService::$MODEL::where('user_id',$userId)->pluck('role_id')->toArray();
|
|
|
|
|
|
- $roles = RoleService::model()::with(['menus'=> function ($query) use ($type) {
|
|
|
+ $roles = RoleService::$MODEL::with(['menus'=> function ($query) use ($type) {
|
|
|
$query->where('type', $type);
|
|
|
- }])->whereIn('id',$roleIds)->orderBy('sort')->get();
|
|
|
+ }])->whereIn('id',$roleIds)->get();
|
|
|
$allMenus = [];
|
|
|
|
|
|
foreach ($roles as $role) {
|