Merge branch 'jhc' into dev

1 year ago · 28f61be90b
parent dea66c18d1 a018fc944f
commit 28f61be90b
1 changed files with 6 additions and 6 deletions
--- a/pkg/model/approval.go
+++ b/pkg/model/approval.go
@ -725,7 +725,7 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		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)