Skip to content

Commit 587449e

Browse files
authored
Merge pull request #15981 from akemidx/bug/sc-27551
2 parents 06ffac9 + c3b5a92 commit 587449e

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

app/Http/Controllers/Api/UsersController.php

+11-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use App\Models\User;
2121
use App\Notifications\CurrentInventory;
2222
use Illuminate\Support\Facades\Auth;
23+
use Illuminate\Database\Eloquent\Builder;
2324
use Illuminate\Http\Request;
2425
use Illuminate\Support\Facades\Storage;
2526
use Illuminate\Support\Facades\Validator;
@@ -80,7 +81,16 @@ public function index(Request $request) : array
8081
'users.website',
8182

8283
])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations')
83-
->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');
84+
->withCount([
85+
'assets as assets_count' => function(Builder $query) {
86+
$query->withoutTrashed();
87+
},
88+
'licenses as licenses_count',
89+
'accessories as accessories_count',
90+
'consumables as consumables_count',
91+
'managesUsers as manages_users_count',
92+
'managedLocations as manages_locations_count'
93+
]);
8494

8595

8696
if ($request->filled('search') != '') {

0 commit comments

Comments
 (0)