|
@@ -264,7 +264,7 @@ class ContainerController extends Controller
|
|
|
$containerCount = $librarys->sum('container_count');
|
|
|
|
|
|
$MyLibrarys=Library::query()->allowed()->filter($request->all())->orderBy('updated_at', 'desc')->get(['id', 'name', 'type','created_at', 'updated_at']);
|
|
|
- $MyContainers = Container::query()->allowed()->when($request,function ($query) use ($request){
|
|
|
+ $MyContainers = Container::query()->allowed()->when($request->type && $request->asset,function ($query) use ($request){
|
|
|
$query->whereHas('library', function ($query) use ($request) {
|
|
|
$query->where('type', $request->type)
|
|
|
->where('asset_id',$request->asset);
|