This commit is contained in:
jhc 2023-06-13 15:13:32 +08:00
parent adab168f02
commit 1a5d282ce2

View File

@ -620,8 +620,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的 Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的
} else { } else {
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
DB.Where(queryApproval). // 我需要审批的 DB.Where(queryApproval))
Or(DB.Where("status = ?", queryApproval.Status).Where("id in (?)", s1))) // 已完成,抄送给我的
} }
modelObj.Count(&count) modelObj.Count(&count)