Merge pull request #70 from zhangtianxiao/master

Server:解决 < LEFT JOIN  或 > RIGHT JOIN 在主副表都有条件时 preparedValueList 里的主副表值顺序错误，导致 MySQL 查询结果不对，PostgreSQL 可能类型报错

Author: TommyLemon

APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java

@@ -1862,6 +1862,8 @@ public String getJoinString() throws Exception {
 
 		if (joinList != null) {
 			String quote = getQuote();
+			List<Object> pvl = new ArrayList<>();
+			boolean changed = false;
 
 			String sql = null;
 			SQLConfig jc;
@@ -1898,7 +1900,10 @@ public String getJoinString() throws Exception {
 							+ quote + tn + quote + "." + quote + j.getTargetKey() + quote;
 					jc.setMain(false).setKeyPrefix(true);
 
-					preparedValueList.addAll(jc.getPreparedValueList());
+//					preparedValueList.addAll(jc.getPreparedValueList());
+
+					pvl.addAll(jc.getPreparedValueList());
+					changed = true;
 					break;
 
 				case "":  // FULL JOIN 
@@ -1916,6 +1921,13 @@ public String getJoinString() throws Exception {
 
 				joinOns += "  \n  " + sql;
 			}
+
+
+			if (changed) {
+				pvl.addAll(preparedValueList);
+				preparedValueList = pvl;
+			}
+
 		}
 
 		return joinOns;