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-13 18:13:26 +08:00
parent 227faf717d
commit ad04688e2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/approval.go
View File

@ -630,7 +630,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime) modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime)
} }
fmt.Println("queryApproval request :==================== start ===================") fmt.Println("queryApproval request :==================== start ===================")
fmt.Println(" queryApproval ", queryApproval) fmt.Printf("queryApproval %+v\n", queryApproval)
fmt.Println("queryApproval request :==================== end ===================") fmt.Println("queryApproval request :==================== end ===================")
if in.ApprovalStatus == 0 { if in.ApprovalStatus == 0 {
@ -640,7 +640,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
} else { } else {
sonQuery := DB.Where(queryApproval) sonQuery := DB.Where(queryApproval)
if in.ApprovalStatus > StatusFail { if in.ApprovalStatus > StatusFail {
sonQuery.Or(DB.Where("id in (?)", s1)) sonQuery.Where(DB.Where("id in (?)", s1))
} }
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
sonQuery) sonQuery)