|
@@ -151,6 +151,9 @@ public class UserController extends ControllerSupport {
|
|
|
if (null != orgId) {
|
|
|
predicates.add(cb.equal(root.get("orgId"), orgId));
|
|
|
}
|
|
|
+ if (null != enable) {
|
|
|
+ predicates.add(cb.equal(root.get("enable"), enable));
|
|
|
+ }
|
|
|
if (null != finalRoleId) {
|
|
|
Subquery<UserRoleRelationEntity> subquery = query
|
|
|
.subquery(UserRoleRelationEntity.class);
|
|
@@ -285,6 +288,9 @@ public class UserController extends ControllerSupport {
|
|
|
if (null != orgId) {
|
|
|
predicates.add(cb.equal(root.get("orgId"), orgId));
|
|
|
}
|
|
|
+ if (null != enable) {
|
|
|
+ predicates.add(cb.equal(root.get("enable"), enable));
|
|
|
+ }
|
|
|
if (null != finalRoleId) {
|
|
|
Subquery<UserRoleRelationEntity> subquery = query
|
|
|
.subquery(UserRoleRelationEntity.class);
|