key[]:{ query:2 或 query:"All" } 默认返回列表分页信息 调整 total 的 key 名，避免同级多列表导致重名

TommyLemon · TommyLemon · commit 09a60dc89191 · 2024-06-16T19:31:27.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -561,15 +561,16 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti
 			isEmpty = child == null || ((JSONArray) child).isEmpty();
 
 			if (isEmpty == false && ("2".equals(query) || "ALL".equals(query))) {
+				String totalKey = JSONResponse.formatArrayKey(key) + "Total";
 				String infoKey = JSONResponse.formatArrayKey(key) + "Info";
-				if (request.containsKey("total") == false && request.containsKey(infoKey) == false
-						&& request.containsKey("total@") == false && request.containsKey(infoKey + "@") == false) {
+				if ((request.containsKey(totalKey) || request.containsKey(infoKey)
+						|| request.containsKey(totalKey + "@") || request.containsKey(infoKey + "@")) == false) {
 					// onParse("total@", "/" + key + "/total");
 					// onParse(infoKey + "@", "/" + key + "/info");
 					// 替换为以下性能更好、对流程干扰最小的方式：
 					String totalPath = AbstractParser.getValuePath(type == TYPE_ITEM ? path : parentPath, "/" + key + "/total");
 					String infoPath = AbstractParser.getValuePath(type == TYPE_ITEM ? path : parentPath, "/" + key + "/info");
-					response.put("total", onReferenceParse(totalPath));
+					response.put(totalKey, onReferenceParse(totalPath));
 					response.put(infoKey, onReferenceParse(infoPath));
 				}
 			}
