|
|
|
@ -72,8 +72,8 @@ class CompanyController extends BaseController
|
|
|
|
$directions = explode(',', $direction);
|
|
|
|
$directions = explode(',', $direction);
|
|
|
|
foreach ($directions as $dir) {
|
|
|
|
foreach ($directions as $dir) {
|
|
|
|
$dir = trim($dir);
|
|
|
|
$dir = trim($dir);
|
|
|
|
// 去除空数据:空字符串、null、只包含空白字符的字符串
|
|
|
|
// 去除空数据:空字符串、null、只包含空白字符的字符串、类似"[]"的数组字符串
|
|
|
|
if (!empty($dir) && $dir !== '' && $dir !== null) {
|
|
|
|
if (!empty($dir) && $dir !== '' && $dir !== null && $dir !== '[]') {
|
|
|
|
$allDirections[] = $dir;
|
|
|
|
$allDirections[] = $dir;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -81,7 +81,9 @@ class CompanyController extends BaseController
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 去重并重新索引,再次过滤空数据
|
|
|
|
// 去重并重新索引,再次过滤空数据
|
|
|
|
$directions = array_values(array_unique(array_filter($allDirections, function ($item) {
|
|
|
|
$directions = array_values(array_unique(array_filter($allDirections, function ($item) {
|
|
|
|
return !empty($item) && trim($item) !== '';
|
|
|
|
$trimmed = trim($item);
|
|
|
|
|
|
|
|
// 过滤空字符串、null、只包含空白字符、类似"[]"的数组字符串
|
|
|
|
|
|
|
|
return !empty($trimmed) && $trimmed !== '' && $trimmed !== '[]';
|
|
|
|
})));
|
|
|
|
})));
|
|
|
|
// 排序
|
|
|
|
// 排序
|
|
|
|
sort($directions);
|
|
|
|
sort($directions);
|
|
|
|
|