|
|
|
@ -614,13 +614,20 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if queryApproval.SubmitterName == "" && in.Status == 0 {
|
|
|
|
|
if in.Status == 0 {
|
|
|
|
|
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))) // 已完成,抄送给我的
|
|
|
|
|
} else {
|
|
|
|
|
sonQuery := DB.Where(&Approval{NowUserId: in.UserID, SubmitterName: queryApproval.SubmitterName})
|
|
|
|
|
if in.ApprovalStatus > StatusFail {
|
|
|
|
|
sonQuery.Where(&Approval{Status: StatusOk})
|
|
|
|
|
sonQuery.Or(DB.Where("id in (?)", s1))
|
|
|
|
|
} else {
|
|
|
|
|
sonQuery.Where(&Approval{Status: queryApproval.Status})
|
|
|
|
|
}
|
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
|
|
|
|
|
DB.Where(queryApproval))
|
|
|
|
|
sonQuery)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
modelObj.Count(&count)
|
|
|
|
|