From e79fdf607fa6e108a77232d323f0fa4ac5e9e1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Tue, 4 Jun 2024 19:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=90=9C=E7=B4=A2=E5=A4=B1=E6=95=88=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=88=90=E5=B0=B1=E4=BC=98=E5=85=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/Sqlite/modules/userAchi.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/Sqlite/modules/userAchi.ts b/src/plugins/Sqlite/modules/userAchi.ts
index 6fad86f1..5cf22a27 100644
--- a/src/plugins/Sqlite/modules/userAchi.ts
+++ b/src/plugins/Sqlite/modules/userAchi.ts
@@ -1,7 +1,7 @@
 /**
  * @file plugins/Sqlite/modules/userAchi.ts
  * @description 用户成就模块
- * @since Beta v0.4.7
+ * @since Beta v0.4.8
  */
 
 import { getUiafStatus } from "../../../utils/UIAF.js";
@@ -59,7 +59,7 @@ async function getSeries(id?: number): Promise<TGApp.Sqlite.Achievement.SeriesTa
 
 /**
  * @description 获取成就数据
- * @since Beta v0.4.7
+ * @since Beta v0.4.8
  * @param {number|undefined} id 成就系列ID
  * @returns {Promise<TGApp.Sqlite.Achievement.SingleTable[]>} 成就数据
  */
@@ -72,7 +72,7 @@ async function getAchievements(id?: string): Promise<TGApp.Sqlite.Achievement.Si
     );
   } else {
     res = await db.select<TGApp.Sqlite.Achievement.SingleTable>(
-      "SELECT * FROM Achievements WHERE series = ? ORDER BY `order`;",
+      "SELECT * FROM Achievements WHERE series = ? ORDER BY isCompleted,`order`;",
       [id],
     );
   }
@@ -96,7 +96,7 @@ async function getSeriesNameCard(id: string): Promise<string> {
 
 /**
  * @description 查找成就数据
- * @since Beta v0.4.7
+ * @since Beta v0.4.8
  * @param {string} keyword 关键词
  * @returns {Promise<TGApp.Sqlite.Achievement.SingleTable[]>} 成就数据
  */
@@ -106,10 +106,12 @@ async function searchAchievements(
   if (keyword === "") return await getAchievements();
   const db = await TGSqlite.getDB();
   const versionReg = /^v\d+(\.\d+)?$/;
+  console.log(versionReg.test(keyword));
   if (versionReg.test(keyword)) {
+    const version = keyword.replace("v", "");
     return await db.select<TGApp.Sqlite.Achievement.SingleTable>(
       "SELECT * FROM Achievements WHERE version LIKE ? ORDER BY isCompleted,`order`;",
-      [keyword],
+      [`%${version}%`],
     );
   }
   return await db.select<TGApp.Sqlite.Achievement.SingleTable>(