From 1a5d282ce204981ea19036ce1208dbc993aac34d Mon Sep 17 00:00:00 2001 From: jhc <9316338+wangyitao309@user.noreply.gitee.com> Date: Tue, 13 Jun 2023 15:13:32 +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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/model/approval.go b/pkg/model/approval.go index d481770..d422f77 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -620,8 +620,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的 } else { modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( - DB.Where(queryApproval). // 我需要审批的 - Or(DB.Where("status = ?", queryApproval.Status).Where("id in (?)", s1))) // 已完成,抄送给我的 + DB.Where(queryApproval)) } modelObj.Count(&count)