fix: 条目日期排序时空值排后面 (#737)

ikaros-dev · Nov 13, 2024 · ba1f7d4 · ba1f7d4
1 parent 44d6f06
commit ba1f7d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -8,6 +8,7 @@
 
 - 条目条件查询接口
 - 条目更新时更新update_time字段
+- 条目日期排序时空值排后面
 
 # 0.20.3
 

diff --git a/server/src/main/java/run/ikaros/server/core/subject/service/impl/SubjectServiceImpl.java b/server/src/main/java/run/ikaros/server/core/subject/service/impl/SubjectServiceImpl.java
@@ -356,12 +356,12 @@ public Mono<PagingWrap<Subject>> listEntitiesByCondition(FindSubjectCondition co
         Query query = Query.query(criteria);
 
         if (updateTimeDesc) {
-            query = query.sort(Sort.by(Sort.Order.desc("update_time")));
+            query = query.sort(Sort.by(Sort.Order.desc("update_time").nullsLast()));
         }
 
         query = query
-            .sort(Sort.by(airTimeDesc ? Sort.Order.desc("air_time")
-                : Sort.Order.asc("air_time")))
+            .sort(Sort.by(airTimeDesc ? Sort.Order.desc("air_time").nullsLast()
+                : Sort.Order.asc("air_time").nullsLast()))
             .sort(Sort.by(Sort.Order.asc("name")))
             .with(pageRequest);