luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
jhc 2023-06-14 09:34:34 +08:00
parent f3327d15b5
commit b9e7ccc9a4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/model/approval.go
View File

@ -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)