Browse Source

调整排序方式

pull/93/head
zhangxin 3 years ago
parent
commit
f04450d7d1
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      services/base/implments/OPCBasicComInfo.service.impl.go
  2. +2
    -2
      services/base/implments/Process.service.impl.go

+ 2
- 2
services/base/implments/OPCBasicComInfo.service.impl.go View File

@ -457,13 +457,13 @@ func (impl *OPCBasicComInfoServiceImplement) Select(user *models.Usertab, urlPar
} }
dao := dal.NewOPCBasicComInfoDAO(session, user.Pid, user.Userid) dao := dal.NewOPCBasicComInfoDAO(session, user.Pid, user.Userid)
if condition.Fill(urlParameters) { if condition.Fill(urlParameters) {
result, err := dao.SelectAndPaging(condition.Paging, predicates, condition.OrderByFields)
result, err := dao.SelectAndPaging(condition.Paging, predicates, []grmi.Field{meta.OPCBasicComInfo_ProjectId, meta.OPCBasicComInfo_PO, meta.OPCBasicComInfo_StepNo})
if err != nil { if err != nil {
return nil, err return nil, err
} }
return result, nil return result, nil
} else { } else {
result, err := dao.Select(predicates, condition.OrderByFields)
result, err := dao.Select(predicates, []grmi.Field{meta.OPCBasicComInfo_ProjectId, meta.OPCBasicComInfo_PO, meta.OPCBasicComInfo_StepNo})
if err != nil { if err != nil {
return nil, err return nil, err
} }


+ 2
- 2
services/base/implments/Process.service.impl.go View File

@ -288,13 +288,13 @@ func (impl *ProcessServiceImplement) Select(user *models.Usertab, urlParameters
} }
dao := dal.NewProcessDAO(session, user.Pid, user.Userid) dao := dal.NewProcessDAO(session, user.Pid, user.Userid)
if condition.Fill(urlParameters) { if condition.Fill(urlParameters) {
result, err := dao.SelectAndPaging(condition.Paging, predicates, condition.OrderByFields)
result, err := dao.SelectAndPaging(condition.Paging, predicates, []grmi.Field{meta.Process_WorkLineId, meta.Process_PO})
if err != nil { if err != nil {
return nil, err return nil, err
} }
return result, nil return result, nil
} else { } else {
result, err := dao.Select(predicates, condition.OrderByFields)
result, err := dao.Select(predicates, []grmi.Field{meta.Process_WorkLineId, meta.Process_PO})
if err != nil { if err != nil {
return nil, err return nil, err
} }


Loading…
Cancel
Save