|
|
@ -293,10 +293,18 @@ func (impl *PlanOrderServiceImplement) SelectAndPaging(user *global.User, urlPar |
|
|
|
engine := db.Eloquent.Master() |
|
|
|
session := engine.NewSession() |
|
|
|
defer session.Close() |
|
|
|
operator, exist := urlParameters["operator"] |
|
|
|
if exist { |
|
|
|
if operator == "*" { |
|
|
|
urlParameters["operator"] = "" |
|
|
|
} |
|
|
|
} |
|
|
|
predicates, err := condition.BuildPredicates(urlParameters) |
|
|
|
if err != nil { |
|
|
|
return grmi.EmptyPagingResult, err |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
dao := dal.NewPlanOrderDAO(session, user.PlantNr, user.UserId) |
|
|
|
condition.Fill(urlParameters) |
|
|
|
result, err := dao.SelectAndPaging(condition.Paging, predicates, condition.OrderByFields) |
|
|
|