|
@@ -11,6 +11,7 @@ use App\Http\Resources\API\UserInfoResource;
|
|
|
use App\Http\Resources\API\UserSimpleResource;
|
|
|
use App\Models\Enums\RequirementStatus;
|
|
|
use App\Models\Menu;
|
|
|
+use App\Models\Permission;
|
|
|
use App\Models\Role;
|
|
|
use App\Models\User;
|
|
|
use Illuminate\Http\Request;
|
|
@@ -26,17 +27,17 @@ class UserController extends Controller
|
|
|
$user = Auth::user();
|
|
|
|
|
|
$menus = Menu::query()->where("group", \request("group", "web"))
|
|
|
- ->get()
|
|
|
- ->filter(fn(Menu $menu) => Auth::user()->can($menu->permission));
|
|
|
+ ->get();
|
|
|
+// ->filter(fn(Menu $menu) => Auth::user()->can($menu->permission));
|
|
|
|
|
|
$items = [];
|
|
|
-
|
|
|
+ $userPerminssion=$user->role->permissions->pluck('name')->toArray();
|
|
|
foreach ($menus as $menu) {
|
|
|
- if(Auth::user()->can($menu->permission)){
|
|
|
+ if(in_array($menu->permission,$userPerminssion)){
|
|
|
$items[] = $menu->name;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
+
|
|
|
$user->menus = $items;
|
|
|
|
|
|
return new UserInfoResource($user);
|