@@ -770,7 +770,7 @@ |
||
| 770 | 770 | * Get column name by order column index. |
| 771 | 771 | * |
| 772 | 772 | * @param int $index |
| 773 | - * @return mixed |
|
| 773 | + * @return boolean|string |
|
| 774 | 774 | */ |
| 775 | 775 | protected function getColumnNameByIndex($index) |
| 776 | 776 | { |
@@ -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 | }); |
@@ -417,8 +417,8 @@ discard block |
||
| 417 | 417 | } |
| 418 | 418 | if (! in_array($table, $joins)) { |
| 419 | 419 | $this->getQueryBuilder() |
| 420 | - ->leftJoin($table, $foreign, '=', $other) |
|
| 421 | - ->orderBy($orderBy, $direction); |
|
| 420 | + ->leftJoin($table, $foreign, '=', $other) |
|
| 421 | + ->orderBy($orderBy, $direction); |
|
| 422 | 422 | } |
| 423 | 423 | } |
| 424 | 424 | |