|
@@ -20,10 +20,14 @@ class ConfigPickupNodeRepository
|
|
|
if (isset($request['keyword'])) {
|
|
|
$this->configPickupNode = $this->configPickupNode
|
|
|
->orderBy('id', 'desc')
|
|
|
+ ->where('city_id', $request['city_id'])
|
|
|
->where(function ($query) use ($request) {
|
|
|
- $query->orWhere('name', 'like', "{$request['keyword']}%")
|
|
|
- ->orWhere('status', $request['status']);
|
|
|
+ $query->where('status', 0)
|
|
|
+ ->orWhere('name', 'like', "{$request['keyword']}%");
|
|
|
});
|
|
|
+ }else{
|
|
|
+ $this->configPickupNode = $this->configPickupNode
|
|
|
+ ->orderBy('id', 'desc')->where(['status' => 0,'city_id' => $request['city_id']]);
|
|
|
}
|
|
|
return $this->configPickupNode->paginate($page);
|
|
|
|