diff --git a/pkg/model/approval.go b/pkg/model/approval.go index 6e22862..f27df3b 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -633,7 +633,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { fmt.Printf("queryApproval %+v\n", queryApproval) fmt.Println("queryApproval request :==================== end ===================") - if in.ApprovalStatus == 0 { + if in.SubmitterName == "" { modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的 Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的