From ec0326f2ae9db7b711f6b5918fe205fc1179c1f9 Mon Sep 17 00:00:00 2001
From: ChiveHao <chivehao@ikaros.run>
Date: Wed, 13 Nov 2024 11:53:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9D=A1=E7=9B=AE=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20(#735)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build: v0.20.4

* feat: 条目条件查询接口
---
 CHANGELOG.MD                                   |  6 ++++++
 gradle.properties                              |  2 +-
 .../service/impl/SubjectServiceImpl.java       | 18 +++++++++---------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 3611ce6f..c79958d6 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -2,6 +2,12 @@
 
 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。
 
+# 0.20.4
+
+## 优化
+
+- 条目条件查询接口
+
 # 0.20.3
 
 ## 新特性
diff --git a/gradle.properties b/gradle.properties
index 85833b45..56d4914e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=0.20.3
+version=0.20.4
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
index a37401be..8fcaffd9 100644
--- 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
@@ -348,16 +348,16 @@ public Mono<PagingWrap<Subject>> listEntitiesByCondition(FindSubjectCondition co
             }
         }
 
-        Query query = Query.query(criteria)
-            .sort(Sort.by(Sort.Order.asc("name")))
-            .sort(Sort.by(Sort.Order.asc("type")))
-            .sort(Sort.by(Sort.Order.asc("nsfw")))
-            .sort(Sort.by(updateTimeDesc
-                ? Sort.Order.desc("update_time")
-                : Sort.Order.asc("update_time")))
-            .sort(Sort.by(airTimeDesc
-                ? Sort.Order.desc("air_time")
+        Query query = Query.query(criteria);
+
+        if (updateTimeDesc) {
+            query = query.sort(Sort.by(Sort.Order.desc("update_time")));
+        }
+
+        query = query
+            .sort(Sort.by(airTimeDesc ? Sort.Order.desc("air_time")
                 : Sort.Order.asc("air_time")))
+            .sort(Sort.by(Sort.Order.asc("name")))
             .with(pageRequest);
 
         Flux<SubjectEntity> subjectEntityFlux = template.select(query, SubjectEntity.class);