|
@@ -52,7 +52,7 @@ func (m Service) List(req model.ListReq) ([]model.Meeting, int, error) {
|
|
|
if req.Value != "" {
|
|
if req.Value != "" {
|
|
|
entityModel = entityModel.Order(common.Snake2Orm(model.Meeting{}, req.Value), req.Type)
|
|
entityModel = entityModel.Order(common.Snake2Orm(model.Meeting{}, req.Value), req.Type)
|
|
|
} else {
|
|
} else {
|
|
|
- entityModel = entityModel.Order(service.DefaultSortField, service.DefaultSortType)
|
|
|
|
|
|
|
+ entityModel = entityModel.Order(service.DefaultSortField, service.DefaultSortType, ",", m.Dao.Columns.CreatedAt, "DESC")
|
|
|
}
|
|
}
|
|
|
res, err := entityModel.Page(req.Current, req.Size).FindAll()
|
|
res, err := entityModel.Page(req.Current, req.Size).FindAll()
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -171,7 +171,7 @@ func (m Service) Exists(id int) error {
|
|
|
|
|
|
|
|
func (m Service) ShortList() ([]model.ShortMeeting, error) {
|
|
func (m Service) ShortList() ([]model.ShortMeeting, error) {
|
|
|
list := make([]model.ShortMeeting, 0)
|
|
list := make([]model.ShortMeeting, 0)
|
|
|
- res, err := m.Dao.M.Order(m.Dao.Columns.Sort, "DESC").FindAll()
|
|
|
|
|
|
|
+ res, err := m.Dao.M.Order(m.Dao.Columns.Sort, "DESC, ", m.Dao.Columns.CreatedAt, "DESC").FindAll()
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return nil, err
|
|
return nil, err
|
|
|
}
|
|
}
|