From f04450d7d182d125b77807cab1b134377f838263 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 2 Sep 2021 10:02:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=92=E5=BA=8F=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/base/implments/OPCBasicComInfo.service.impl.go | 4 ++-- services/base/implments/Process.service.impl.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/base/implments/OPCBasicComInfo.service.impl.go b/services/base/implments/OPCBasicComInfo.service.impl.go index ed7abc4..24c172e 100644 --- a/services/base/implments/OPCBasicComInfo.service.impl.go +++ b/services/base/implments/OPCBasicComInfo.service.impl.go @@ -457,13 +457,13 @@ func (impl *OPCBasicComInfoServiceImplement) Select(user *models.Usertab, urlPar } dao := dal.NewOPCBasicComInfoDAO(session, user.Pid, user.Userid) 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 { return nil, err } return result, nil } 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 { return nil, err } diff --git a/services/base/implments/Process.service.impl.go b/services/base/implments/Process.service.impl.go index 0d02130..39a72c2 100644 --- a/services/base/implments/Process.service.impl.go +++ b/services/base/implments/Process.service.impl.go @@ -288,13 +288,13 @@ func (impl *ProcessServiceImplement) Select(user *models.Usertab, urlParameters } dao := dal.NewProcessDAO(session, user.Pid, user.Userid) 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 { return nil, err } return result, nil } else { - result, err := dao.Select(predicates, condition.OrderByFields) + result, err := dao.Select(predicates, []grmi.Field{meta.Process_WorkLineId, meta.Process_PO}) if err != nil { return nil, err }