@@ -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 | }); |
@@ -392,8 +392,8 @@ discard block |
||
| 392 | 392 | $orderBy = $table . '.' . $relationColumn; |
| 393 | 393 | |
| 394 | 394 | $this->getQueryBuilder() |
| 395 | - ->leftJoin($table, $foreign, '=', $other) |
|
| 396 | - ->orderBy($orderBy, $orderable['direction']); |
|
| 395 | + ->leftJoin($table, $foreign, '=', $other) |
|
| 396 | + ->orderBy($orderBy, $orderable['direction']); |
|
| 397 | 397 | } else { |
| 398 | 398 | $this->getQueryBuilder()->orderBy($column, $orderable['direction']); |
| 399 | 399 | } |