guodj 4 лет назад
Родитель
Сommit
fb5c2b91d9
2 измененных файлов с 3 добавлено и 1 удалено
  1. 1 1
      service/meeting/meeting.go
  2. 2 0
      service/reservation/reservation.go

+ 1 - 1
service/meeting/meeting.go

@@ -171,7 +171,7 @@ func (m Service) Exists(id int) error {
 
 func (m Service) ShortList() ([]model.ShortMeeting, error) {
 	list := make([]model.ShortMeeting, 0)
-	res, err := m.Dao.M.FindAll()
+	res, err := m.Dao.M.Order(m.Dao.Columns.Sort).FindAll()
 	if err != nil {
 		return nil, err
 	}

+ 2 - 0
service/reservation/reservation.go

@@ -64,6 +64,8 @@ func (s Service) List(req model.ListReq) ([]model.List, int, error) {
 	}
 	if req.Value != "" {
 		entityModel = entityModel.Order(s.Dao.Table+"."+common.Snake2Orm(model.MeetingReservation{}, req.Value), req.Type)
+	} else {
+		entityModel = entityModel.Order(s.Dao.Table+"."+s.Dao.Columns.CreatedAt, "DESC")
 	}
 	res, err := entityModel.Page(req.Current, req.Size).
 		Fields("meeting_reservation.*", "meeting.Name", "base_user.DepartmentName").