🐛 修复jsonContains丢失JSON_ARRAY关键字

ballcat-projects · Jan 30, 2024 · 4f38519 · 4f38519
1 parent 180720d
commit 4f38519
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...atis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/LambdaQueryWrapperX.java b/...atis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/LambdaQueryWrapperX.java
@@ -256,7 +256,7 @@ public LambdaQueryWrapperX<T> jsonContains(SFunction<T, ?> column, Collection<Ob
 				.map(i -> this.formatParam(null, i))
 				.collect(Collectors.joining(",", "(", ")"));
 
-			return String.format("%s(%s,%s)", keyword, field, content);
+			return String.format("%s(%s,JSON_ARRAY%s)", keyword, field, content);
 		});
 		return this;
 	}

diff --git a/...-plus/src/test/java/org/ballcat/mybatisplus/conditions/query/LambdaQueryWrapperXTest.java b/...-plus/src/test/java/org/ballcat/mybatisplus/conditions/query/LambdaQueryWrapperXTest.java
@@ -43,10 +43,10 @@ void test() {
 							new EqualsTo(column, new StringValue("ex2")))));
 
 		assertContains(
-				"JSON_CONTAINS(a.list,(#{ew.paramNameValuePairs.MPGENVAL1},#{ew.paramNameValuePairs.MPGENVAL2}))",
+				"JSON_CONTAINS(a.list,JSON_ARRAY(#{ew.paramNameValuePairs.MPGENVAL1},#{ew.paramNameValuePairs.MPGENVAL2}))",
 				wrapper().jsonContainsIfPresent(Entity::getList, Arrays.asList("1", "2")));
 		assertContains(
-				" JSON_CONTAINS(a.list,(#{ew.paramNameValuePairs.MPGENVAL1},#{ew.paramNameValuePairs.MPGENVAL2})) AND",
+				" JSON_CONTAINS(a.list,JSON_ARRAY(#{ew.paramNameValuePairs.MPGENVAL1},#{ew.paramNameValuePairs.MPGENVAL2})) AND",
 				wrapper().jsonContains(Entity::getList, "1", "2").eq(Entity::getString, "eq1"));
 	}