diff --git a/pkg/model/approval.go b/pkg/model/approval.go index 313f6f8..194b85d 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -610,6 +610,10 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { } s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id") + if in.StartTime != "" && in.EndTime != "" { + modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime) + } + if queryApproval.SubmitterName == "" && in.Status == 0 { modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的