Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into feature/MAT-6351-okta-update
Browse files Browse the repository at this point in the history
  • Loading branch information
nmorasb committed Nov 7, 2023
2 parents 3659398 + 09ee05c commit 954387b
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public Page<Measure> findMyActiveMeasures(String userId, Pageable pageable, Stri
Criteria measureSetCriteria =
new Criteria()
.orOperator(
Criteria.where("measureSet.owner").is(userId),
Criteria.where("measureSet.owner").regex("^\\Q" + userId + "\\E$", "i"),
Criteria.where("measureSet.acls.userId")
.is(userId)
.regex("^\\Q" + userId + "\\E$", "i")
.and("measureSet.acls.roles")
.in(RoleEnum.SHARED_WITH));

Expand Down

0 comments on commit 954387b

Please sign in to comment.