Add support for OR query filter for PlanItemInstanceQueries (flowable…

…#3922)


Co-authored-by: Christopher Welsch <[email protected]>

modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/runtime/PlanItemInstanceQuery.java

@@ -96,6 +96,16 @@ public interface PlanItemInstanceQuery extends Query<PlanItemInstanceQuery, Plan
     PlanItemInstanceQuery planItemDefinitionType(String planItemDefinitionType);
     PlanItemInstanceQuery planItemDefinitionTypes(List<String> planItemDefinitionType);
 
+    /**
+     * Begin an OR statement. Make sure you invoke the endOr method at the end of your OR statement.
+     */
+    PlanItemInstanceQuery or();
+
+    /**
+     * End an OR statement.
+     */
+    PlanItemInstanceQuery endOr();
+
     /**
      * @return The query will only return ended (completed/terminated/occurred/exited) plan item instances.
      *         No runtime instances will be returned.

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisPlanItemInstanceDataManagerImpl.java

@@ -189,5 +189,11 @@ protected void setSafeInValueLists(PlanItemInstanceQueryImpl planItemInstanceQue
         if (planItemInstanceQuery.getInvolvedGroups() != null) {
             planItemInstanceQuery.setSafeInvolvedGroups(createSafeInValuesList(planItemInstanceQuery.getInvolvedGroups()));
         }
+
+        if (planItemInstanceQuery.getOrQueryObjects() != null && !planItemInstanceQuery.getOrQueryObjects().isEmpty()) {
+            for (PlanItemInstanceQueryImpl oInstanceQuery : planItemInstanceQuery.getOrQueryObjects()) {
+                setSafeInValueLists(oInstanceQuery);
+            }
+        }
     }
 }