|
|
@@ -27,12 +27,12 @@ class Operation extends Controller
|
|
|
]);
|
|
|
$page = request()->input('page', 1);
|
|
|
$limit = request()->input('limit', 15);
|
|
|
- $query = User::query();
|
|
|
+ $query = User::where('users.from','<>', 2);
|
|
|
if (isset($params['user_id'])) {
|
|
|
$user_id = $params['user_id'] ?? null;
|
|
|
$query->where(function ($query1) use ($user_id) {
|
|
|
- $query1->where('member_id', $user_id)
|
|
|
- ->orWhere('first_name', 'like', "%{$user_id}%");
|
|
|
+ $query1->where('users.member_id', $user_id)
|
|
|
+ ->orWhere('users.first_name', 'like', "%{$user_id}%");
|
|
|
});
|
|
|
}
|
|
|
|