From 2a0e0c1cd5666480e19843e8b37f6b2b3d9dc5c8 Mon Sep 17 00:00:00 2001 From: jhc <9316338+wangyitao309@user.noreply.gitee.com> Date: Tue, 13 Jun 2023 19:56: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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/model/approval.go b/pkg/model/approval.go index 2c883be..fad5d72 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -642,7 +642,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { } else { sonQuery := DB.Where(queryApproval) if in.ApprovalStatus > StatusFail || in.ApprovalStatus == 0 { - sonQuery.Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1.Where("user_id = ?", in.UserID).Select("approval_id"))) + sonQuery.Where(DB.Where("id in (?)", s1.Where("user_id = ?", in.UserID).Select("approval_id"))) } modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( sonQuery)