Просмотр исходного кода

fix(培训考试): 资料查询默认按照序号排序

liuyaqi 3 лет назад
Родитель
Сommit
2b619649fc
1 измененных файлов с 10 добавлено и 6 удалено
  1. 10 6
      service/learning/material.go

+ 10 - 6
service/learning/material.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"lims_adapter/dao/learning"
+	"lims_adapter/model"
 	"lims_adapter/model/learning"
 
 	"dashoo.cn/micro_libary/micro_srv"
@@ -107,13 +108,16 @@ func (s LearningMaterialService) List(ctx context.Context, req *learning.Learnin
 		dao = dao.Page(req.Page.Current, req.Page.Size)
 	}
 
-	if req.OrderBy != nil && req.OrderBy.Value != "" {
-		order := "asc"
-		if req.OrderBy.Type == "desc" {
-			order = "desc"
+	if req.OrderBy == nil {
+		req.OrderBy = &model.OrderBy{
+			Value: "SortNo",
 		}
-		dao = dao.Order(req.OrderBy.Value, order)
 	}
+	order := "asc"
+	if req.OrderBy.Type == "desc" {
+		order = "desc"
+	}
+	dao = dao.Order(req.OrderBy.Value, order)
 	ent, err := dao.All()
 	return total, ent, err
 }
@@ -127,7 +131,7 @@ func (s LearningMaterialService) ListMy(ctx context.Context, req *learning.Learn
 	if req.Type != 0 {
 		dao = dao.Where("Type = ?", req.Type)
 	}
-	ent, err := dao.All()
+	ent, err := dao.Order("SortNo").All()
 	if err != nil {
 		return nil, err
 	}