From 6d1ee388e9f524540013a3af8a1f2a62b4e9a14a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 25 Dec 2023 14:01:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E5=99=A8=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E6=8E=92=E5=BA=8F=E5=87=BA=E7=8E=B0=E7=A9=BA=E9=A1=B9?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/dataset/impl/direct/DirectFieldService.java | 1 + 1 file changed, 1 insertion(+) 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); }