diff --git 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 index a5bed73343..2358fda047 100644 --- 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); }