修改判断条件

main
jhc 1 year ago
parent f0ab4a944a
commit 559f1e2b4d

@ -626,7 +626,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime) modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime)
} }
if in.Status == 0 { if in.ApprovalStatus == 0 {
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的 DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的 Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的

Loading…
Cancel
Save