feat: fix permission seaerch criteria

onecx · Mar 7, 2024 · 2f81a15 · 2f81a15
1 parent f6ca445
commit 2f81a15
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/org/tkit/onecx/permission/domain/criteria/PermissionSearchCriteria.java b/src/main/java/org/tkit/onecx/permission/domain/criteria/PermissionSearchCriteria.java
@@ -1,5 +1,7 @@
 package org.tkit.onecx.permission.domain.criteria;
 
+import java.util.Set;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,6 +10,7 @@
 public class PermissionSearchCriteria {
 
     private String appId;
+    private Set<String> productNames;
     private Integer pageNumber = 0;
     private Integer pageSize = 100;
 }
diff --git a/src/main/java/org/tkit/onecx/permission/domain/daos/PermissionDAO.java b/src/main/java/org/tkit/onecx/permission/domain/daos/PermissionDAO.java
@@ -31,6 +31,11 @@ public PageResult<Permission> findByCriteria(PermissionSearchCriteria criteria)
 
             List<Predicate> predicates = new ArrayList<>();
             addSearchStringPredicate(predicates, cb, root.get(Permission_.appId), criteria.getAppId());
+
+            if (criteria.getProductNames() != null) {
+                predicates.add(root.get(Permission_.PRODUCT_NAME).in(criteria.getProductNames()));
+            }
+
             if (!predicates.isEmpty()) {
                 cq.where(predicates.toArray(new Predicate[] {}));
             }