Merge branch 'jhc' into dev

1 year ago · 17f31ce8d0
parent 28f61be90b d157d072e5
commit 17f31ce8d0
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(" json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
+	modelObj.Where(" status = 2  , json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
 	modelObj.Count(&count)