Merge branch 'master' of https://github.com/Tencent/APIJSON

TommyLemon · TommyLemon · commit 6ca112f732fb · 2022-10-09T18:57:07.000+08:00
* 'master' of https://github.com/Tencent/APIJSON: fix: 修复子查询与外查询参数顺序 将链接有公众号切换成腾讯开发者社区的链接
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -3804,7 +3804,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;
 	}
diff --git a/README.md b/README.md
@@ -456,9 +456,9 @@ https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md
   
 [关于APIJSON远程函数](https://mp.weixin.qq.com/s?__biz=Mzg3NTc1NDUyNA==&mid=2247483950&idx=1&sn=b11e70bdf083c55d72238e107449ae2e&chksm=cf3de75df84a6e4b3a4acd0846531b0bd12bc90379523fbaf6b4f900fc3cdc1b1ce3eff97fd9&scene=178&cur_album_id=2548737392338354178#rd)
   
-[APIJSON新增方法实例](https://mp.weixin.qq.com/s?__biz=Mzg3NTc1NDUyNA==&mid=2247483931&idx=1&sn=0e44ba7ba5613ad533c00c56cd8b2192&chksm=cf3de768f84a6e7e93ac20c26b7a4553d638d6ceb3edbdfaf0b05b80d28c1f3973860c4ac30b&scene=178&cur_album_id=2548737392338354178#rd)
+[APIJSON新增方法实例](https://cloud.tencent.com/developer/article/2098890)
   
-[APIJSON-APIJSON的那些事儿](https://mp.weixin.qq.com/s?__biz=Mzg3NTc1NDUyNA==&mid=2247483901&idx=2&sn=679f37ec3421956b2b191abfe3437c6b&chksm=cf3de48ef84a6d98d338f9eaec25c01c0dec559ae149f62c3823b076a966fc0898dc0f004a16&token=422905191&lang=zh_CN#rd)
+[APIJSON-APIJSON的那些事儿](https://cloud.tencent.com/developer/article/2098888)
 
 [APIJSON-零代码接口和文档 JSON 协议 与 ORM 库](https://cloud.tencent.com/developer/article/2077042)
 

Original file line number	Diff line number	Diff line change
`@@ -3804,7 +3804,9 @@ public String getSubqueryString(Subquery subquery) throws Exception {`
`3804`	`3804`	`cfg.setPreparedValueList(new ArrayList<>());`
`3805`	`3805`	`String sql = (range == null \|\| range.isEmpty() ? "" : range) + "(" + cfg.getSQL(isPrepared()) + ") ";`
`3806`	`3806`
`3807`		`- preparedValueList.addAll(cfg.getPreparedValueList());`
	`3807`	`+ List<Object> origPreparedValueList = preparedValueList;`
	`3808`	`+ preparedValueList = cfg.getPreparedValueList();`
	`3809`	`+ preparedValueList.addAll(origPreparedValueList);`
`3808`	`3810`
`3809`	`3811`	`return sql;`
`3810`	`3812`	`}`