|
@@ -60,8 +60,9 @@ class WebsiteService implements WebsiteServiceInterface
|
|
|
|
|
|
$count = $resultWwhere->leftJoin("website_column", "website.website_column_id", "website_column.id")
|
|
|
->leftJoin("district", "district.id", "website.city_id")->count();
|
|
|
-
|
|
|
- $result = $resultWwhere->select("website.*", "website_column.column_name", "district.name as city_name")
|
|
|
+ $result = $resultWwhere->leftJoin("website_column", "website.website_column_id", "website_column.id")
|
|
|
+ ->leftJoin("district", "district.id", "website.city_id")
|
|
|
+ ->select("website.*", "website_column.column_name", "district.name as city_name")
|
|
|
->limit($data['pageSize'])->offset(($data['page'] - 1) * $data['pageSize'])->orderBy("website.updated_at", "desc")->get();
|
|
|
|
|
|
if (empty($result)) {
|