Merge branch 'fix/statement分页查询不限制数量' into 'wrdp'

[数据中心]statement分页查询不限制数量

See merge request o2oa/o2oa!2431

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/BaseAction.java

@@ -33,7 +33,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 						}.getType());
 			}
 			runtime.page = this.adjustPage(page);
-			runtime.size = this.adjustSize(size);
+			runtime.size = this.adjustSize2(size);
 			Set<String> keys = runtime.parameters.keySet();
 			if (keys.contains(Runtime.PARAMETER_PERSON)) {
 				runtime.parameters.put(Runtime.PARAMETER_PERSON, effectivePerson.getDistinguishedName());
@@ -61,4 +61,10 @@ abstract class BaseAction extends StandardJaxrsAction {
 		}
 		return runtime;
 	}
+
+	public Integer adjustSize2(Integer pageSize) {
+		return (pageSize == null || pageSize < 1)
+				? EntityManagerContainer.DEFAULT_PAGESIZE.intValue()
+				: pageSize;
+	}
 }