@@ -216,8 +216,8 @@ discard block |
||
| 216 | 216 | $myQuery = clone $this->query; |
| 217 | 217 | $myQuery->orWhereHas($relation, function ($q) use ($column, $keyword, $query) { |
| 218 | 218 | $sql = $q->select($this->connection->raw('count(1)')) |
| 219 | - ->where($column, 'like', $keyword) |
|
| 220 | - ->toSql(); |
|
| 219 | + ->where($column, 'like', $keyword) |
|
| 220 | + ->toSql(); |
|
| 221 | 221 | $sql = "($sql) >= 1"; |
| 222 | 222 | $query->orWhereRaw($sql, [$keyword]); |
| 223 | 223 | }); |
@@ -397,8 +397,8 @@ discard block |
||
| 397 | 397 | } |
| 398 | 398 | if (! in_array($table, $joins)) { |
| 399 | 399 | $this->getQueryBuilder() |
| 400 | - ->leftJoin($table, $foreign, '=', $other) |
|
| 401 | - ->orderBy($orderBy, $orderable['direction']); |
|
| 400 | + ->leftJoin($table, $foreign, '=', $other) |
|
| 401 | + ->orderBy($orderBy, $orderable['direction']); |
|
| 402 | 402 | } |
| 403 | 403 | } else { |
| 404 | 404 | $this->getQueryBuilder()->orderBy($column, $orderable['direction']); |