|
@@ -8,8 +8,6 @@ import java.util.Map;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Stream;
|
|
import java.util.stream.Stream;
|
|
|
|
|
|
-import javax.persistence.criteria.Join;
|
|
|
|
-import javax.persistence.criteria.JoinType;
|
|
|
|
import javax.persistence.criteria.Predicate;
|
|
import javax.persistence.criteria.Predicate;
|
|
import javax.persistence.criteria.Root;
|
|
import javax.persistence.criteria.Root;
|
|
import javax.persistence.criteria.Subquery;
|
|
import javax.persistence.criteria.Subquery;
|
|
@@ -144,7 +142,7 @@ public class UserController extends ControllerSupport {
|
|
Subquery<UserRoleRelationEntity> subquery = query
|
|
Subquery<UserRoleRelationEntity> subquery = query
|
|
.subquery(UserRoleRelationEntity.class);
|
|
.subquery(UserRoleRelationEntity.class);
|
|
Root<UserRoleRelationEntity> subRoot = subquery.from(UserRoleRelationEntity.class);
|
|
Root<UserRoleRelationEntity> subRoot = subquery.from(UserRoleRelationEntity.class);
|
|
- subquery.select(subRoot);
|
|
|
|
|
|
+ subquery.select(subRoot.get("userId"));
|
|
Predicate p1 = cb.equal(subRoot.get("roleId"), roleId);
|
|
Predicate p1 = cb.equal(subRoot.get("roleId"), roleId);
|
|
Predicate p2 = cb.equal(subRoot.get("userId"), root.get("id"));
|
|
Predicate p2 = cb.equal(subRoot.get("userId"), root.get("id"));
|
|
subquery.where(cb.and(p1, p2));
|
|
subquery.where(cb.and(p1, p2));
|