Merge pull request #7316 from dataease/pr@dev@fix_chinese_sort_error

fix: 过滤器中文排序出现空项报错
This commit is contained in:
fit2cloud-chenyw 2023-12-25 14:04:37 +08:00 committed by GitHub
commit 38a4e5b39d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -91,6 +91,7 @@ public class DirectFieldService implements DataSetFieldService {
return CollectionUtil.sort(list, (v1, v2) -> {
Collator instance = Collator.getInstance(Locale.CHINESE);
if (ObjectUtils.isEmpty(v1) || ObjectUtils.isEmpty(v2)) return 0;
if (StringUtils.equals("desc", sortStr)) {
return instance.compare(v2, v1);
}