From 21a400d1f7fc94d9a8074c5008cd00ed2697ea14 Mon Sep 17 00:00:00 2001
From: alex <reizero@live.com>
Date: Sun, 31 May 2020 00:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4id=E9=80=86=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt       | 2 +-
 .../kotlin/com/synebula/gaea/mongo/query/MongoGenericQuery.kt | 2 +-
 .../main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt   | 2 +-
 src/gaea/src/main/kotlin/com/synebula/gaea/query/Params.kt    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt
index 9c006e7..9469d19 100644
--- a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt
+++ b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/MongoExt.kt
@@ -112,7 +112,7 @@ fun order(orders: Map<String, OrderType>?): Sort {
         orderList.add(Sort.Order(Sort.Direction.valueOf(it.value.name), it.key))
     }
     return if (orderList.size == 0)
-        Sort.by("_id")
+        Sort.by(Sort.Direction.DESC, "_id")
     else
         Sort.by(orderList)
 }
diff --git a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoGenericQuery.kt b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoGenericQuery.kt
index 9489bee..62615d8 100644
--- a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoGenericQuery.kt
+++ b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoGenericQuery.kt
@@ -102,7 +102,7 @@ open class MongoGenericQuery<TView>(
             }
             query.select(fields.toTypedArray())
             query.where(param.parameters, this.clazz!!)
-            query.with(order(param.orderBy))
+            query.with(order(param.orders))
             query.skip(param.index).limit(param.size)
             result.data = this.template.find(query, this.clazz!!, this.collection)
             result
diff --git a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt
index 4767d72..8a69b5d 100644
--- a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt
+++ b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt
@@ -48,7 +48,7 @@ open class MongoQuery(var template: MongoTemplate, var logger: ILogger? = null)
         }
         query.select(fields.toTypedArray())
         query.where(param.parameters, clazz)
-        query.with(order(param.orderBy))
+        query.with(order(param.orders))
         query.skip(param.index).limit(param.size)
         result.data = this.template.find(query, clazz, this.collection(clazz))
         return result
diff --git a/src/gaea/src/main/kotlin/com/synebula/gaea/query/Params.kt b/src/gaea/src/main/kotlin/com/synebula/gaea/query/Params.kt
index ffd94b3..d370fbb 100644
--- a/src/gaea/src/main/kotlin/com/synebula/gaea/query/Params.kt
+++ b/src/gaea/src/main/kotlin/com/synebula/gaea/query/Params.kt
@@ -19,7 +19,7 @@ data class Params(var page: Int = 1, var size: Int = 10) {
     /**
      * 排序条件。
      */
-    var orderBy: MutableMap<String, OrderType> = hashMapOf()
+    var orders: MutableMap<String, OrderType> = hashMapOf()
 
     /**
      * 查询条件。
@@ -38,7 +38,7 @@ data class Params(var page: Int = 1, var size: Int = 10) {
      * 添加排序条件
      */
     fun addOrderBy(field: String, type: OrderType = OrderType.ASC): Params {
-        orderBy[field] = type
+        orders[field] = type
         return this
     }
 }