up

server/service/course/course_action.go

@@ -104,7 +104,7 @@ func (courseActionService *CourseActionService)GetCourseActionInfoList(info cour
     	return
     }
 
-	err = db.Limit(limit).Offset(offset).Find(&courseActions).Error
+	err = db.Limit(limit).Order("action_start").Offset(offset).Find(&courseActions).Error
 	if info.Address != "" {
 		var user course.CourseUsers
 		err = global.GVA_DB.Model(&course.CourseUsers{}).Where("address = ?",info.Address).First(&user).Error

server/service/course/course_action_users.go

@@ -5,6 +5,7 @@ import (
 	"courseSign/server/model/common/request"
 	"courseSign/server/model/course"
 	courseReq "courseSign/server/model/course/request"
+	"gorm.io/gorm"
 )
 
 type CourseActionUsersService struct {
@@ -89,13 +90,17 @@ func (courseActionUsersService *CourseActionUsersService)GetCourseActionUsersInf
 	for k,v := range courseActionUserss {
 		var courseInfo course.CourseList
 		err = global.GVA_DB.Model(&course.CourseList{}).Where("id = ?",v.Cid).First(&courseInfo).Error
-		if err != nil {
+		if err != nil && err != gorm.ErrRecordNotFound{
 			return
+		} else if err != nil && err == gorm.ErrRecordNotFound {
+			continue
 		}
 		var actionInfo course.CourseAction
 		err = global.GVA_DB.Model(&course.CourseAction{}).Where("id = ?",v.Aid).First(&actionInfo).Error
 		if err != nil {
 			return
+		} else if err != nil && err == gorm.ErrRecordNotFound {
+			continue
 		}
 		courseActionUserss[k].CourseName = courseInfo.CourseName
 		courseActionUserss[k].ActionName = actionInfo.ActionName