SQL JOIN：解决副表除了引用赋值键值对还有其它条件键值对时不能命中缓存，导致 一对多、多对多副表数据重复 以及 一对一、多对一 查询性能问题

Author: TommyLemon

APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java

@@ -2197,18 +2197,42 @@ else if (prior && andList.isEmpty() == false) {
 					String userIdKey = getUserIdKey();
 					String userIdInKey = userIdKey + "{}";
 
-					if (andList.contains(idKey)) {
-						i ++;
+					int lastIndex;
+					if (key.equals(idKey)) {
+						lastIndex = -1;
 					}
-					if (andList.contains(idInKey)) {
-						i ++;
+					else if (key.equals(idInKey)) {
+						lastIndex = andList.lastIndexOf(idKey);
 					}
-					if (andList.contains(userIdKey)) {
-						i ++;
+					else if (key.equals(userIdKey)) {
+						lastIndex = andList.lastIndexOf(idInKey);
+						if (lastIndex < 0) {
+							lastIndex = andList.lastIndexOf(idKey);
+						}
 					}
-					if (andList.contains(userIdInKey)) {
-						i ++;
+					else if (key.equals(userIdInKey)) {
+						lastIndex = andList.lastIndexOf(userIdKey);
+						if (lastIndex < 0) {
+							lastIndex = andList.lastIndexOf(idInKey);
+						}
+						if (lastIndex < 0) {
+							lastIndex = andList.lastIndexOf(idKey);
+						}
+					}
+					else {
+						lastIndex = andList.lastIndexOf(userIdInKey);
+						if (lastIndex < 0) {
+							lastIndex = andList.lastIndexOf(userIdKey);
+						}
+						if (lastIndex < 0) {
+							lastIndex = andList.lastIndexOf(idInKey);
+						}
+						if (lastIndex < 0) {
+							lastIndex = andList.lastIndexOf(idKey);
+						}
 					}
+					
+					i = lastIndex + 1;
 				}
 
 				if (prior) {
@@ -2219,6 +2243,7 @@ else if (prior && andList.isEmpty() == false) {
 			}
 			combine.put("&", andList);
 		}
+		
 		return this;
 	}