|
|
|
@ -840,6 +840,13 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
|
|
|
|
|
if in.SubmitterName != "" {
|
|
|
|
|
modelObj = modelObj.Where("submitter_name = ? ", in.SubmitterName)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if in.StartTime != "" && in.EndTime != "" {
|
|
|
|
|
modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
modelObj.Where(" status = 2 and json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
|
|
|
|
|
|
|
|
|
|