From 77c1a029bd60796e1345666e86ea79b48f54c201 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Fri, 5 Jul 2024 00:05:15 +0800
Subject: [PATCH] :bug: Bug fixes

---
 .idea/workspace.xml                    | 8 +++++---
 pkg/internal/server/admin/users_api.go | 2 +-
 web/src/views/admin/users.vue          | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a5370d6..1f1c14f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,10 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":rotating_light: Fix ts lint issue">
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":poop: Remove mis-imported cgo">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/admin/users_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/admin/users_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/views/admin/users.vue" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/views/admin/users.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -151,7 +153,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":bug: Fix ws security blocked" />
     <MESSAGE value=":bug: Invisible status is visible to others" />
     <MESSAGE value=":ambulance: Fix nil pointer panic" />
     <MESSAGE value=":bug: Not supposed to appear to status at the same time" />
@@ -176,7 +177,8 @@
     <MESSAGE value=":sparkles: View auth factors" />
     <MESSAGE value=":sparkles: View auth factors in admin panel" />
     <MESSAGE value=":rotating_light: Fix ts lint issue" />
-    <option name="LAST_COMMIT_MESSAGE" value=":rotating_light: Fix ts lint issue" />
+    <MESSAGE value=":poop: Remove mis-imported cgo" />
+    <option name="LAST_COMMIT_MESSAGE" value=":poop: Remove mis-imported cgo" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/internal/server/admin/users_api.go b/pkg/internal/server/admin/users_api.go
index 6315880..7e919ca 100644
--- a/pkg/internal/server/admin/users_api.go
+++ b/pkg/internal/server/admin/users_api.go
@@ -22,7 +22,7 @@ func listUser(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	}
 	var items []models.Account
-	if err := database.C.Offset(offset).Limit(take).Find(&items).Error; err != nil {
+	if err := database.C.Offset(offset).Limit(take).Order("id ASC").Find(&items).Error; err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	}
 
diff --git a/web/src/views/admin/users.vue b/web/src/views/admin/users.vue
index 6b00a4b..eb027ef 100644
--- a/web/src/views/admin/users.vue
+++ b/web/src/views/admin/users.vue
@@ -114,6 +114,9 @@ const pagination = reactive({
 })
 
 async function readUsers({ page, itemsPerPage }: { page?: number; itemsPerPage?: number }) {
+  if (itemsPerPage) pagination.pageSize = itemsPerPage
+  if (page) pagination.page = page
+
   reverting.value = true
   const res = await request(
     "/api/admin/users?" +