From b9e7ccc9a409c34d5360c73384d77097063a878d Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Wed, 14 Jun 2023 09:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/model/approval.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkg/model/approval.go b/pkg/model/approval.go
index cc5172c..18e75ba 100644
--- a/pkg/model/approval.go
+++ b/pkg/model/approval.go
@@ -10,7 +10,6 @@ import (
 	msg "github.com/fonchain_enterprise/fonchain-approval/pkg/m"
 	"github.com/jinzhu/copier"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 	"gorm.io/plugin/soft_delete"
 	"strconv"
 	"time"
@@ -647,13 +646,13 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 
 	modelObj.Count(&count)
 
-	if len(ids) > 0 { //根据具体id排序
-		modelObj = modelObj.Clauses(clause.OrderBy{
-			Expression: clause.Expr{SQL: "FIELD(id,?) " + in.OrderBy, Vars: []interface{}{ids}, WithoutParentheses: true},
-		})
-	} else {
-		modelObj = modelObj.Order("id " + in.OrderBy)
-	}
+	//if len(ids) > 0 { //根据具体id排序
+	//	modelObj = modelObj.Clauses(clause.OrderBy{
+	//		Expression: clause.Expr{SQL: "FIELD(id,?) " + in.OrderBy, Vars: []interface{}{ids}, WithoutParentheses: true},
+	//	})
+	//} else {
+	modelObj = modelObj.Order("id " + in.OrderBy)
+	//}
 
 	modelObj.Limit(int(in.PageSize)).Offset(page.GetOffset(in.Page, in.PageSize)).Find(&list)