renun/zfile
1
0
Fork 0
mirror of https://github.com/zfile-dev/zfile.git synced 2025-04-19 05:34:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 修复某些存储引擎 API 中文件夹不返回时间和大小时，排序的 NPE 问题。

Browse Source
This commit is contained in:
zhaojun1998
2021-02-03 21:04:28 +08:00
parent 2b21d8a73c
commit a8e6d9af6a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/im/zhaojun/zfile/util/FileComparator.java
View File

@@ -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<FileItemDTO> {
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;