|
|
@@ -626,6 +626,12 @@ class WebsiteService implements WebsiteServiceInterface
|
|
|
$website_id = [
|
|
|
'website_id' => $data['website_id'],
|
|
|
];
|
|
|
+ $website_column_arr = Website::where('id',$data['website_id'])->value('website_column_arr_id');
|
|
|
+ if(empty($website_column_arr)){
|
|
|
+ return Result::error("未查询到此网站所属网系！",0);
|
|
|
+ }
|
|
|
+ $website_column_arr = json_decode($website_column_arr, true);
|
|
|
+ // return Result::success(!in_array(3,$website_column_arr) && $data['pid'] == 0);
|
|
|
// 初始化 $pid 数组
|
|
|
$pid = [];
|
|
|
// 以下注释掉的代码是之前的逻辑，用于获取非顶级分类的 pid
|
|
|
@@ -637,10 +643,10 @@ class WebsiteService implements WebsiteServiceInterface
|
|
|
$pid = array_values(array_unique($pid->toArray()));
|
|
|
// 构建查询语句
|
|
|
$query = WebsiteCategory::where($website_id)
|
|
|
- ->when(isset($data['is_show']) && $data['is_show'] == 1 && $data['pid'] == 0, function ($query) use ($data) {
|
|
|
- $query->where('is_show', $data['is_show']);
|
|
|
+ ->when(!in_array(3,$website_column_arr) && $data['pid'] == 0, function ($query) use ($website_column_arr) {
|
|
|
+ $query->where('is_show', 1);
|
|
|
})
|
|
|
- ->when(!isset($data['is_show']), function ($query) use ($data) {
|
|
|
+ ->when(in_array(3,$website_column_arr), function ($query) use ($data) {
|
|
|
$query->where('pid', $data['pid']);
|
|
|
})
|
|
|
->offset($data['placeid'])
|
15313670163