fix: 修复子查询与外查询参数顺序

transtone · transtone · commit 09dc7c0e85b0 · 2022-10-04T09:57:45.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -3787,7 +3787,9 @@ public String getSubqueryString(Subquery subquery) throws Exception {
 		cfg.setPreparedValueList(new ArrayList<>());
 		String sql = (range  == null || range.isEmpty() ? "" : range) + "(" + cfg.getSQL(isPrepared()) + ") ";
 
-		preparedValueList.addAll(cfg.getPreparedValueList());
+		List<Object> origPreparedValueList = preparedValueList;
+		preparedValueList = cfg.getPreparedValueList();
+		preparedValueList.addAll(origPreparedValueList);
 
 		return sql;
 	}

Original file line number	Diff line number	Diff line change
`@@ -3787,7 +3787,9 @@ public String getSubqueryString(Subquery subquery) throws Exception {`
`3787`	`3787`	`cfg.setPreparedValueList(new ArrayList<>());`
`3788`	`3788`	`String sql = (range == null \|\| range.isEmpty() ? "" : range) + "(" + cfg.getSQL(isPrepared()) + ") ";`
`3789`	`3789`
`3790`		`- preparedValueList.addAll(cfg.getPreparedValueList());`
	`3790`	`+ List<Object> origPreparedValueList = preparedValueList;`
	`3791`	`+ preparedValueList = cfg.getPreparedValueList();`
	`3792`	`+ preparedValueList.addAll(origPreparedValueList);`
`3791`	`3793`
`3792`	`3794`	`return sql;`
`3793`	`3795`	`}`