待我审核 排除 申请人过滤条件
parent
8aeab18853
commit
fdd57a27c2
|
@ -633,9 +633,9 @@ public class ProcessController {
|
||||||
return repository.findAll((root, query, cb) -> {
|
return repository.findAll((root, query, cb) -> {
|
||||||
Predicate predicate = QueryByExamplePredicateBuilder.getPredicate(root, cb, Example.of(projectProcess, exampleMatcher));
|
Predicate predicate = QueryByExamplePredicateBuilder.getPredicate(root, cb, Example.of(projectProcess, exampleMatcher));
|
||||||
// 添加新的条件
|
// 添加新的条件
|
||||||
Predicate equal = cb.equal(root.get("applyPersonId"), loginUserId);
|
// Predicate equal = cb.equal(root.get("applyPersonId"), loginUserId);
|
||||||
Expression<Integer> findInSet = cb.function("find_in_set", Integer.class, cb.literal(loginUserId), root.get("currentAuditId"));
|
Expression<Integer> findInSet = cb.function("find_in_set", Integer.class, cb.literal(loginUserId), root.get("currentAuditId"));
|
||||||
return cb.and(predicate, cb.or(equal, cb.greaterThan(findInSet, 0)));
|
return cb.and(predicate, cb.greaterThan(findInSet, 0));
|
||||||
}, pageRequest);
|
}, pageRequest);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in New Issue