Merge branch 'jhc' into dev

This commit is contained in:
jhc 2023-04-14 09:27:18 +08:00
commit eee8529c77

View File

@ -727,7 +727,7 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
//modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID}) //modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
modelObj.Where(" status = 2 , json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID) modelObj.Where(" status = 2 and json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
modelObj.Count(&count) modelObj.Count(&count)