|
@@ -86,7 +86,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
classCriteria.setOrders(orderItems);
|
|
|
}
|
|
|
classCriteria.setPage(1L);
|
|
|
- classCriteria.setSize(500L);
|
|
|
+ classCriteria.setSize(SpringHelper.getLong("persagy.common.sql.limit",500L));
|
|
|
List<ObjectTypeDefine> all = new ArrayList<ObjectTypeDefine>();
|
|
|
this.queryPageClass(all, classCriteria, groupCode, projectId);
|
|
|
return all;
|
|
@@ -387,7 +387,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
}
|
|
|
criteria.put("valid", 1);
|
|
|
objectCriteria.setPage(1L);
|
|
|
- objectCriteria.setSize(500L);
|
|
|
+ objectCriteria.setSize(SpringHelper.getLong("persagy.common.sql.limit",500L));
|
|
|
objectCriteria.setCriteria(criteria);
|
|
|
if (CollectionUtil.isNotEmpty(orderItem)) {
|
|
|
objectCriteria.setOrders(orderItem);
|
|
@@ -453,7 +453,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
condition.put("valid", 1);
|
|
|
queryCriteria.setCriteria(condition);
|
|
|
queryCriteria.setPage(1L);
|
|
|
- queryCriteria.setSize(500L);
|
|
|
+ queryCriteria.setSize(SpringHelper.getLong("persagy.common.sql.limit",500L));
|
|
|
List<ObjectInfoDefine> all = new ArrayList<ObjectInfoDefine>();
|
|
|
this.queryPageFunids(all, queryCriteria, groupCode, projectId);
|
|
|
return all;
|
|
@@ -811,14 +811,14 @@ public class RelationReportService implements IRelationReportService {
|
|
|
|
|
|
all.addAll(infos);
|
|
|
|
|
|
- if (count < 500) {
|
|
|
+ if (count < SpringHelper.getLong("persagy.common.sql.limit",500L)) {
|
|
|
return;
|
|
|
- } else if ((infos.size()*classCriteria.getPage()) > count) {
|
|
|
+ }
|
|
|
+ if ((infos.size()*classCriteria.getPage()) > count) {
|
|
|
return;
|
|
|
- } else {
|
|
|
- classCriteria.setPage((classCriteria.getPage() + 1));
|
|
|
- this.queryPageClass(all, classCriteria, groupCode, projectId);
|
|
|
}
|
|
|
+ classCriteria.setPage((classCriteria.getPage() + 1));
|
|
|
+ this.queryPageClass(all, classCriteria, groupCode, projectId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -836,17 +836,13 @@ public class RelationReportService implements IRelationReportService {
|
|
|
if (count == null || CollectionUtil.isEmpty(infos)) {
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
all.addAll(infos);
|
|
|
-
|
|
|
- if (count < 500) {
|
|
|
- return;
|
|
|
- } else if ((infos.size()*objectCriteria.getPage()) > count) {
|
|
|
+ if ((count < SpringHelper.getLong("persagy.common.sql.limit",500L))
|
|
|
+ || ((infos.size()*objectCriteria.getPage()) > count)) {
|
|
|
return;
|
|
|
- } else {
|
|
|
- objectCriteria.setPage((objectCriteria.getPage() + 1));
|
|
|
- this.queryPageObjects(all, objectCriteria, groupCode, projectId);
|
|
|
}
|
|
|
+ objectCriteria.setPage((objectCriteria.getPage() + 1));
|
|
|
+ this.queryPageObjects(all, objectCriteria, groupCode, projectId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -895,14 +891,14 @@ public class RelationReportService implements IRelationReportService {
|
|
|
|
|
|
all.addAll(infos);
|
|
|
|
|
|
- if (count < 500) {
|
|
|
+ if (count < SpringHelper.getLong("persagy.common.sql.limit",500L)) {
|
|
|
return;
|
|
|
- } else if ((infos.size()*queryCriteria.getPage()) > count) {
|
|
|
+ }
|
|
|
+ if ((infos.size()*queryCriteria.getPage()) > count) {
|
|
|
return;
|
|
|
- } else {
|
|
|
- queryCriteria.setPage((queryCriteria.getPage() + 1));
|
|
|
- this.queryPageFunids(all, queryCriteria, groupCode, projectId);
|
|
|
}
|
|
|
+ queryCriteria.setPage((queryCriteria.getPage() + 1));
|
|
|
+ this.queryPageFunids(all, queryCriteria, groupCode, projectId);
|
|
|
}
|
|
|
|
|
|
}
|