fix: 过滤器中文排序出现空项报错

2023-12-25 14:01:36 +08:00 · 2023-12-25 14:01:36 +08:00 · 6d1ee388e9
commit 6d1ee388e9
parent 6c34b94799
1 changed files with 1 additions and 0 deletions
--- a/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
@ -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);
            }