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-04-13 18:33:11 +08:00
parent 229ef3e809
commit 3a99d797d5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/model/approval.go
View File

@ -11,6 +11,7 @@ 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"
) )
@ -168,7 +169,7 @@ func ExistPayApproval(in *approval.CreateRequest) bool {
// //
subQuery1 := DB.Model(&Approval{}).Where(&Approval{SubmitterID: in.SubmitterID, Type: TypeBundlePayPrice}). subQuery1 := DB.Model(&Approval{}).Where(&Approval{SubmitterID: in.SubmitterID, Type: TypeBundlePayPrice}).
Where("status in (?)",[]uint64{StatusDoing,StatusOk}). Where("status in (?)", []uint64{StatusDoing, StatusOk}).
Select("id") Select("id")
DB.Model(&BundlePayPrice{}).Where("approval_id in (?)", subQuery1).Where(&BundlePayPrice{ShowUid: in.BundlePayPrice.ShowUid}).Count(&count) DB.Model(&BundlePayPrice{}).Where("approval_id in (?)", subQuery1).Where(&BundlePayPrice{ShowUid: in.BundlePayPrice.ShowUid}).Count(&count)
@ -690,8 +691,12 @@ func MySubmitApprovals(in *approval.ListRequest) ([]*Approval, int64) {
} }
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})