|
@@ -2236,9 +2236,9 @@ class NewsService implements NewsServiceInterface
|
|
|
'status' => 2,
|
|
|
'website_id' => $data['website_id'],
|
|
|
];
|
|
|
- if ((empty($data['catid']) || !isset($data['catid'])) && (empty($data['keyword']) || !isset($data['keyword'])) && (empty($data['city_id']) || !isset($data['city_id']))) {
|
|
|
- return Result::error("查询失败", 0);
|
|
|
- }
|
|
|
+ // if ((empty($data['catid']) || !isset($data['catid'])) && (empty($data['keyword']) || !isset($data['keyword'])) && (empty($data['city_id']) || !isset($data['city_id']))) {
|
|
|
+ // return Result::error("查询失败", 0);
|
|
|
+ // }
|
|
|
if ((empty($data['catid']) || !isset($data['catid'])) && (!empty($data['city_id']) || isset($data['city_id']))) {
|
|
|
$category = WebsiteCategory::where('website_id', $data['website_id'])->where('pid', $data['id'])->orderBy('sort')->first(['category_id']);
|
|
|
$data['catid'] = $category->category_id ?? 0;
|