key[]:{ query:2 或 query:"All" } 解决列表数据为空不返回列表分页信息

TommyLemon · TommyLemon · commit 0093589068d7 · 2024-06-16T23:02:39.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -560,16 +560,18 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti
 			child = parser.onArrayParse(value, path, key, isSubquery);
 			isEmpty = child == null || ((JSONArray) child).isEmpty();
 
-			if (isEmpty == false && ("2".equals(query) || "ALL".equals(query))) {
+			if ("2".equals(query) || "ALL".equals(query)) { // 不判断 isEmpty，因为分页数据可能只是某页没有
 				String totalKey = JSONResponse.formatArrayKey(key) + "Total";
 				String infoKey = JSONResponse.formatArrayKey(key) + "Info";
 				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");
+
+					String keyPath = AbstractParser.getValuePath(type == TYPE_ITEM ? path : parentPath, "/" + key);
+					String totalPath = keyPath + "/total";
+					String infoPath = keyPath + "/info";
 					response.put(totalKey, onReferenceParse(totalPath));
 					response.put(infoKey, onReferenceParse(infoPath));
 				}
