|
|
|
@ -721,14 +721,14 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
|
Preload("Exhibition.ApprovalExhibitions")
|
|
|
|
|
|
|
|
|
|
modelObj.Where(" json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
|
|
|
|
|
|
|
|
|
|
if in.Type != "" {
|
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
|
|
|
|
|
|
|
|
|
|
modelObj.Where(" json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
|
|
|
|
|
|
|
|
|
|
modelObj.Count(&count)
|
|
|
|
|
|
|
|
|
|
modelObj.Limit(int(in.PageSize)).Offset(page.GetOffset(in.Page, in.PageSize)).Order("id desc").Find(&list)
|
|
|
|
|