Ken vor 7 Stunden
Ursprung
Commit
5d3d7253fa
3 geänderte Dateien mit 7 neuen und 4 gelöschten Zeilen
  1. 5 4
      app/Services/MenuService.php
  2. 1 0
      app/Services/RoleService.php
  3. 1 0
      app/Services/RoleUserService.php

+ 5 - 4
app/Services/MenuService.php

@@ -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) {

+ 1 - 0
app/Services/RoleService.php

@@ -16,6 +16,7 @@ use App\Services\RoleMenuService;
  */
 class RoleService extends BaseService
 {
+    public static string $MODEL = Role::class;
     /**
      * @description: 模型
      * @return {string}

+ 1 - 0
app/Services/RoleUserService.php

@@ -15,6 +15,7 @@ use Illuminate\Support\Facades\Cache;
  */
 class RoleUserService extends BaseService
 {
+    public static string $MODEL = RoleUser::class;
     /**
      * @description: 模型
      * @return {string}