Merge pull request #65 from teamones-open/fix_schema

weijer · web-flow · commit 8e93a1324a78 · 2024-06-15T17:32:01.000+08:00
fxied: 自定义字段查询修复非 in 和 not in sql 数值可能误传数组情况
diff --git a/src/think/model/RelationModel.php b/src/think/model/RelationModel.php
@@ -2011,10 +2011,13 @@ private function parserFilterCustomItemCondition(&$filterData, $field, $conditio
                     $filterData["_string"] = "JSON_UNQUOTE( JSON_EXTRACT(`json`, '$.{$field}' ) ) {$itemCondition} ({$itemValue})";
                 }
             } else {
+                if (is_array($itemValue)) {
+                    $itemValue = json_encode($itemValue, JSON_UNESCAPED_UNICODE);
+                }
                 if (!empty($moduleCode)) {
-                    $filterData["JSON_UNQUOTE( JSON_EXTRACT(`{$moduleCode}`.`json`, '$.{$field}' ) )"] = $condition;
+                    $filterData["JSON_UNQUOTE( JSON_EXTRACT(`{$moduleCode}`.`json`, '$.{$field}' ) )"] = [$itemCondition, $itemValue];
                 } else {
-                    $filterData["JSON_UNQUOTE( JSON_EXTRACT(`json`, '$.{$field}' ) )"] = $condition;
+                    $filterData["JSON_UNQUOTE( JSON_EXTRACT(`json`, '$.{$field}' ) )"] = [$itemCondition, $itemValue];
                 }
             }
         } else {

Original file line number	Diff line number	Diff line change
`@@ -2011,10 +2011,13 @@ private function parserFilterCustomItemCondition(&$filterData, $field, $conditio`
`2011`	`2011`	$filterData["_string"] = "JSON_UNQUOTE( JSON_EXTRACT(`json`, '$.{$field}' ) ) {$itemCondition} ({$itemValue})";
`2012`	`2012`	`}`
`2013`	`2013`	`} else {`
	`2014`	`+ if (is_array($itemValue)) {`
	`2015`	`+ $itemValue = json_encode($itemValue, JSON_UNESCAPED_UNICODE);`
	`2016`	`+ }`
`2014`	`2017`	`if (!empty($moduleCode)) {`
`2015`		- $filterData["JSON_UNQUOTE( JSON_EXTRACT(`{$moduleCode}`.`json`, '$.{$field}' ) )"] = $condition;
	`2018`	+ $filterData["JSON_UNQUOTE( JSON_EXTRACT(`{$moduleCode}`.`json`, '$.{$field}' ) )"] = [$itemCondition, $itemValue];
`2016`	`2019`	`} else {`
`2017`		- $filterData["JSON_UNQUOTE( JSON_EXTRACT(`json`, '$.{$field}' ) )"] = $condition;
	`2020`	+ $filterData["JSON_UNQUOTE( JSON_EXTRACT(`json`, '$.{$field}' ) )"] = [$itemCondition, $itemValue];
`2018`	`2021`	`}`
`2019`	`2022`	`}`
`2020`	`2023`	`} else {`