From ad04688e2d5cd42448f805a3a4fef358b24bbd95 Mon Sep 17 00:00:00 2001 From: jhc <9316338+wangyitao309@user.noreply.gitee.com> Date: Tue, 13 Jun 2023 18:13:26 +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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/model/approval.go b/pkg/model/approval.go index 3d9dca3..6e22862 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -630,7 +630,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime) } fmt.Println("queryApproval request :==================== start ===================") - fmt.Println(" queryApproval ", queryApproval) + fmt.Printf("queryApproval %+v\n", queryApproval) fmt.Println("queryApproval request :==================== end ===================") if in.ApprovalStatus == 0 { @@ -640,7 +640,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { } else { sonQuery := DB.Where(queryApproval) 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( sonQuery)