From a8e6d9af6ab6fb5d035d9bad97ffb13066939879 Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Wed, 3 Feb 2021 21:04:28 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=BC=95=E6=93=8E=20API=20=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E4=B8=8D=E8=BF=94=E5=9B=9E=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E5=A4=A7=E5=B0=8F=E6=97=B6=EF=BC=8C=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=9A=84=20NPE=20=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/im/zhaojun/zfile/util/FileComparator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/im/zhaojun/zfile/util/FileComparator.java b/src/main/java/im/zhaojun/zfile/util/FileComparator.java index 82f1707..27d1a22 100644 --- a/src/main/java/im/zhaojun/zfile/util/FileComparator.java +++ b/src/main/java/im/zhaojun/zfile/util/FileComparator.java @@ -1,5 +1,6 @@ package im.zhaojun.zfile.util; +import cn.hutool.core.comparator.CompareUtil; import im.zhaojun.zfile.model.dto.FileItemDTO; import im.zhaojun.zfile.model.enums.FileTypeEnum; @@ -43,8 +44,8 @@ public class FileComparator implements Comparator { if (o1Type.equals(o2Type)) { int result; switch (sortBy) { - case "time": result = o1.getTime().compareTo(o2.getTime()); break; - case "size": result = o1.getSize().compareTo(o2.getSize()); break; + case "time": result = CompareUtil.compare(o1.getTime(), o2.getTime()); break; + case "size": result = CompareUtil.compare(o1.getSize(), o2.getSize()); break; default: result = naturalOrderComparator.compare(o1.getName(), o2.getName()); break; } return "asc".equals(order) ? result : -result;