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

修改查询 已阅和待阅读 1.0

Browse Source
This commit is contained in:
jhc 2023-04-13 18:42:21 +08:00
parent 3a99d797d5
commit fb40e8f200
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/model/approval.go
View File

@ -11,7 +11,6 @@ import (
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"strings"
"time" "time"
) )
@ -687,16 +686,16 @@ func MySubmitApprovals(in *approval.ListRequest) ([]*Approval, int64) {
Preload("Exhibition.ApprovalExhibitions") Preload("Exhibition.ApprovalExhibitions")
if in.Status != 0 { if in.Status != 0 {
if in.Status == 6 {
modelObj.Where("status in ?", []int{4, 5})
} else {
modelObj = modelObj.Where(&Approval{Status: int8(in.Status)}) modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
} }
}
if in.Type != "" { if in.Type != "" {
if len(strings.Split(in.Type, ",")) > 1 {
modelObj.Where("`type` in ?", strings.Split(in.Type, ","))
} else {
modelObj = modelObj.Where(&Approval{Type: in.Type}) modelObj = modelObj.Where(&Approval{Type: in.Type})
} }
}
modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID}) modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})