Merge branch 'main' of github.com:flowable/flowable-engine

flowable · Oct 29, 2024 · baba466 · baba466
2 parents 07592d1 + 9170a8b
commit baba466
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/...ngine/src/main/java/org/flowable/cmmn/engine/impl/repository/CaseDefinitionQueryImpl.java b/...ngine/src/main/java/org/flowable/cmmn/engine/impl/repository/CaseDefinitionQueryImpl.java
@@ -403,6 +403,10 @@ public Set<String> getIds() {
         return ids;
     }
 
+    public List<List<String>> getSafeIds() {
+        return getSafeList(ids);
+    }
+
     public String getName() {
         return name;
     }

diff --git a/...ble-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseDefinition.xml b/...ble-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseDefinition.xml
@@ -184,10 +184,14 @@
         RES.ID_ = #{id, jdbcType=VARCHAR}
       </if>
       <if test="ids != null and ids">
-        and RES.ID_ in
-        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
-          #{id, jdbcType=VARCHAR}
-        </foreach>
+          and (
+              <foreach item="listItem" collection="safeIds" separator="OR">
+                  RES.ID_ in
+                  <foreach item="id" collection="listItem" open="(" separator="," close=")">
+                      #{id, jdbcType=VARCHAR}
+                  </foreach>
+              </foreach>
+          )
       </if>
       <if test="category != null">
         and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}

diff --git a/...es/flowable-engine/src/main/java/org/flowable/engine/impl/ProcessDefinitionQueryImpl.java b/...es/flowable-engine/src/main/java/org/flowable/engine/impl/ProcessDefinitionQueryImpl.java
@@ -455,6 +455,10 @@ public Set<String> getIds() {
         return ids;
     }
 
+    public List<List<String>> getSafeIds() {
+        return getSafeList(ids);
+    }
+
     public String getName() {
         return name;
     }

diff --git a/...s/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinition.xml b/...s/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinition.xml
@@ -167,10 +167,14 @@
         RES.ID_ = #{id, jdbcType=NVARCHAR}
       </if>
       <if test="ids != null and ids">
-        and RES.ID_ in
-        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
-          #{id, jdbcType=NVARCHAR}
-        </foreach>
+          and (
+              <foreach item="listItem" collection="safeIds" separator="OR">
+                  RES.ID_ in
+                  <foreach item="id" collection="listItem" open="(" separator="," close=")">
+                      #{id, jdbcType=NVARCHAR}
+                  </foreach>
+              </foreach>
+          )
       </if>
       <if test="category != null">
         and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}