Merge branch 'jhc' into dev

1 year ago · eee8529c77
parent 17f31ce8d0 44b76dc6ea
commit eee8529c77
1 changed files with 1 additions and 1 deletions
--- a/pkg/model/approval.go
+++ b/pkg/model/approval.go
@ -727,7 +727,7 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {

 	//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)