update

Modules/Admin/Entities/AdminRoleMenu.php

-<?php
-/**
- * @desc
- * @author    [ZZM]
- * @since     2023/10/21
- * @copyright
- */
-
-namespace Modules\Admin\Entities;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-class AdminRoleMenu extends Model
-{
-    protected $fillable = [
-        'role_id','menu_id'
-    ];
-}
\ No newline at end of file

Modules/Admin/Entities/AdminRoleUser.php

-<?php
-/**
- * @desc
- * @author    [ZZM]
- * @since     2023/10/21
- * @copyright
- */
-
-namespace Modules\Admin\Entities;
-
-use Illuminate\Database\Eloquent\Model;
-
-class AdminRoleUser extends Model
-{
-    protected $fillable = [
-        'role_id','user_id'
-    ];
-}
\ No newline at end of file

Modules/Admin/Http/Controllers/AuthController.php

@@ -165,6 +165,7 @@ class AuthController extends BaseController
 
         $data = [
             'user_info' => Helper::mapAttr($user,['id', 'username', 'avatar', 'avatar_full_url', 'name', 'created_at', 'updated_at']),
+            "is_admin"    => Helper::isAdministrator($role->id),
             "menus"    => Helper::getRoleMenu($role,true),
             "apis"    => Helper::getRoleApi($role,true),
             "announcements"    => $announcements,
@@ -172,6 +173,4 @@ class AuthController extends BaseController
 
         return $this->response->array(['data'=>$data]);
     }
-
-
 }

Modules/Admin/Http/Controllers/RoleController.php

@@ -14,6 +14,7 @@ use Modules\Admin\Entities\AdminMenu;
 use Modules\Admin\Entities\AdminRole;
 use Modules\Admin\Entities\AdminRoleMenu;
 use Modules\Admin\Entities\AdminRoleUser;
+use Modules\Admin\Entities\AdminUser;
 use Modules\Admin\Http\Requests\RoleRequest;
 use Modules\Admin\Http\Transformers\AdminRoleTransformer;
 use Modules\Admin\Http\Utils\Helper;
@@ -250,7 +251,7 @@ class RoleController extends BaseController
                 abort(500,'超级管理员不可删除');
             }
 
-            if(AdminRoleUser::where('role_id',$role->id)->count() > 0){
+            if(AdminUser::where('role_id',$role->id)->count() > 0){
                 abort("此角色还有关联的用户，无法删除");
             }
 

Modules/Admin/Http/Utils/Helper.php

@@ -86,7 +86,7 @@ class Helper
 
         $menu_ids = $role->menus?:[];
         if($menu_ids){
-            $menu = AdminMenu::orderBy('order','asc')->whereIn('id',$menu_ids)->where('is_menu', 1)->get();
+            $menu = AdminMenu::orderBy('order','asc')->whereIn('id',$menu_ids)->get();
             $menu = $menu->toArray();
         }else{
             $menu = [];