diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 61aad10734..1d34f90a39 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -20,6 +20,7 @@ use App\Models\License; use App\Models\User; use App\Notifications\CurrentInventory; use Illuminate\Support\Facades\Auth; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Validator; @@ -80,7 +81,16 @@ class UsersController extends Controller 'users.website', ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations') - ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_users_count', 'managedLocations as manages_locations_count'); + ->withCount([ + 'assets as assets_count' => function(Builder $query) { + $query->withoutTrashed(); + }, + 'licenses as licenses_count', + 'accessories as accessories_count', + 'consumables as consumables_count', + 'managesUsers as manages_users_count', + 'managedLocations as manages_locations_count' + ]); if ($request->filled('search') != '') {