From d327fa2021da431c08bcbea90d734188990ffb0c Mon Sep 17 00:00:00 2001
From: guosurui <13012615613@163.com>
Date: Tue, 30 Jan 2024 12:56:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B4=BB=E5=8A=A8=E6=8C=89=E4=B8=BB?=
 =?UTF-8?q?=E9=94=AE=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/checkin.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dao/checkin.go b/dao/checkin.go
index 6a11a01..f6827b4 100644
--- a/dao/checkin.go
+++ b/dao/checkin.go
@@ -74,10 +74,11 @@ func (c CheckinDAO) SaveUserActivity(userActivity *po.UserActivity) {
 func (c CheckinDAO) FindAllActivities(isTeacher bool) []po.Activity {
 	var arr []po.Activity
 	var err error
+	// 按照主键排序
 	if isTeacher {
-		err = c.Tx.Find(&arr, "teacher_available=?", true).Error
+		err = c.Tx.Find(&arr, "teacher_available=?", true).Order("id").Error
 	} else {
-		err = c.Tx.Find(&arr).Error
+		err = c.Tx.Find(&arr).Order("id").Error
 	}
 	if err != nil {
 		panic(err)