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