Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw 8 years ago
parent
commit
c2ae2c0cd8

+ 1 - 1
src/main/java/com/goafanti/portal/controller/PortalSearchApiController.java

@@ -96,7 +96,7 @@ public class PortalSearchApiController extends BaseApiController {
 			return res;
 		}
 		Integer pNo = 1;
-		Integer pSize = 2;
+		Integer pSize = 12;
 		if (StringUtils.isNumeric(pageSize)) {
 			pSize = Integer.parseInt(pageSize);
 		}

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -262,8 +262,8 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			pNo = 1;
 		}
 
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
+		if (pSize == null || pSize < 0 || pSize > 12) {
+			pSize = 12;
 		}
 		return (Pagination<OrgSubscriberListBo>) findPage("findSearchSubscriberListByPage", "findSearchSubscriberCount",
 				params, pNo, pSize);

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -171,8 +171,8 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 			pNo = 1;
 		}
 
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
+		if (pSize == null || pSize < 0 || pSize > 12) {
+			pSize = 12;
 		}
 		return (Pagination<UserSubscriberListBo>) findPage("findSearchSubscriberListByPage",
 				"findSearchSubscriberCount", params, pNo, pSize);