From 144b543091938631c3c91ada02be6d7cbaff7dd0 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sun, 11 Sep 2022 22:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/dependence.ts | 7 +++++--
 back/services/env.ts        | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/back/services/dependence.ts b/back/services/dependence.ts
index fba1b623..24922ade 100644
--- a/back/services/dependence.ts
+++ b/back/services/dependence.ts
@@ -125,8 +125,11 @@ export default class DependenceService {
     return docs;
   }
 
-  private async find(query: any, sort?: any): Promise<Dependence[]> {
-    const docs = await DependenceModel.findAll({ where: { ...query } });
+  private async find(query: any, sort: any = []): Promise<Dependence[]> {
+    const docs = await DependenceModel.findAll({
+      where: { ...query },
+      order: [...sort, ['createdAt', 'DESC']],
+    });
     return docs;
   }
 
diff --git a/back/services/env.ts b/back/services/env.ts
index 24217b5d..53f34592 100644
--- a/back/services/env.ts
+++ b/back/services/env.ts
@@ -112,7 +112,10 @@ export default class EnvService {
       };
     }
     try {
-      const result = await this.find(condition, [['position', 'DESC']]);
+      const result = await this.find(condition, [
+        ['position', 'DESC'],
+        ['createdAt', 'DESC'],
+      ]);
       return result as any;
     } catch (error) {
       throw error;