Skip to content

Commit c1dc78a

Browse files
Merge pull request #2277 from suraj-webkul/issue#2275
Issue #2275 has been fixed.
2 parents 914bf28 + 7476a95 commit c1dc78a

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

packages/Webkul/Attribute/src/Repositories/AttributeRepository.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,13 @@ public function getLookUpOptions($lookup, $query = '', $columns = [])
128128
$currentUser = auth()->guard('user')->user();
129129

130130
if ($currentUser?->view_permission === 'group') {
131-
return $userRepository->leftJoin('user_groups', 'users.id', '=', 'user_groups.user_id')
132-
->where('users.name', 'like', '%'.urldecode($query).'%')
131+
$query = urldecode($query);
132+
133+
$userIds = bouncer()->getAuthorizedUserIds();
134+
135+
return $userRepository
136+
->when(! empty($userIds), fn ($queryBuilder) => $queryBuilder->whereIn('users.id', $userIds))
137+
->when(! empty($query), fn ($queryBuilder) => $queryBuilder->where('users.name', 'like', "%{$query}%"))
133138
->get();
134139
} elseif ($currentUser?->view_permission === 'individual') {
135140
return $userRepository->where('users.id', $currentUser->id);

0 commit comments

Comments
 (0)