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)