Merge branch 'jhc' into dev
This commit is contained in:
commit
28f61be90b
@ -725,7 +725,7 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|||||||
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
||||||
}
|
}
|
||||||
|
|
||||||
modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
|
//modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
|
||||||
|
|
||||||
modelObj.Where(" json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
|
modelObj.Where(" json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user