|
@@ -943,6 +943,15 @@ class WebsiteService implements WebsiteServiceInterface
|
|
array_push($where, ['website.website_name', 'like', '%' . $data['keyword'] . '%']);
|
|
array_push($where, ['website.website_name', 'like', '%' . $data['keyword'] . '%']);
|
|
}
|
|
}
|
|
$result = Website::where($where)->get();
|
|
$result = Website::where($where)->get();
|
|
|
|
+
|
|
|
|
+ if (isset($data['website_column_id'])) {
|
|
|
|
+ $target = $data['website_column_id'];
|
|
|
|
+ $result = $result->filter(function ($item) use ($target) {
|
|
|
|
+ $arr = json_decode($item->website_column_arr_id, true);
|
|
|
|
+ return !in_array($target, $arr);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+
|
|
if ($result) {
|
|
if ($result) {
|
|
return Result::success($result);
|
|
return Result::success($result);
|
|
} else {
|
|
} else {
|