|
@@ -1834,7 +1834,7 @@ class WebsiteService implements WebsiteServiceInterface
|
|
|
// array_push($where, ['category.city_id', '=', $data['city_id']]);
|
|
// array_push($where, ['category.city_id', '=', $data['city_id']]);
|
|
|
// }
|
|
// }
|
|
|
$result_real = WebsiteCategory::where($where)
|
|
$result_real = WebsiteCategory::where($where)
|
|
|
- ->where('website_category.is_show', 1) //显示
|
|
|
|
|
|
|
+ // ->where('website_category.is_show', 1) //显示
|
|
|
->whereNotNull('website_category.real_pid') //只显示顶级
|
|
->whereNotNull('website_category.real_pid') //只显示顶级
|
|
|
->leftJoin("category", 'website_category.category_id', 'category.id')
|
|
->leftJoin("category", 'website_category.category_id', 'category.id')
|
|
|
->select(
|
|
->select(
|
|
@@ -1847,7 +1847,7 @@ class WebsiteService implements WebsiteServiceInterface
|
|
|
->orderBy("updated_at", "desc")
|
|
->orderBy("updated_at", "desc")
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
$result = WebsiteCategory::where($where)
|
|
$result = WebsiteCategory::where($where)
|
|
|
- ->where('website_category.is_show', 1) //显示
|
|
|
|
|
|
|
+ // ->where('website_category.is_show', 1) //显示
|
|
|
->whereNull('website_category.real_pid') //只显示顶级
|
|
->whereNull('website_category.real_pid') //只显示顶级
|
|
|
->leftJoin("category", 'website_category.category_id', 'category.id')
|
|
->leftJoin("category", 'website_category.category_id', 'category.id')
|
|
|
->select(
|
|
->select(
|
LiuJ