From bf74483f7776ac4fb1c815824ad37430fef0a291 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Wed, 27 Feb 2019 09:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8-=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=20http(s)=20URL=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9D=A1=E6=95=B0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/report/ReportController.java  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/report/ReportController.java b/src/main/java/com/nis/web/controller/report/ReportController.java
index df6f44659..ac35c3237 100644
--- a/src/main/java/com/nis/web/controller/report/ReportController.java
+++ b/src/main/java/com/nis/web/controller/report/ReportController.java
@@ -276,11 +276,10 @@ public class ReportController extends BaseController {
 			Map<String, String> noExportMap = new HashMap<String, String>();
 			// ---------------------------
 			PageLog<NtcAsnRecord> page = new PageLog<NtcAsnRecord>(request, response);
-			page.setPageNo(1);
-			page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
+			page.setPageSize(-1);
 			Map<String, Object> params = new HashMap<String, Object>();
 			params.put("pageSize", page.getPageSize());
-			params.put("pageNo", page.getPageNo());
+			//params.put("pageNo", page.getPageNo());
 			// 判断请求参数
 			if (StringUtils.isNotEmpty(log.getSearchAsnType())) {
 				params.put("searchAsnType", log.getSearchAsnType());
@@ -381,11 +380,10 @@ public class ReportController extends BaseController {
 			Map<String, String> noExportMap = new HashMap<String, String>();
 			// ---------------------------
 			PageLog<NtcIpRangeReport> page = new PageLog<NtcIpRangeReport>(request, response);
-			page.setPageNo(1);
-			page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
+			//page.setPageNo(1);
+			page.setPageSize(-1);
 			Map<String, Object> params = new HashMap<String, Object>();
 			params.put("pageSize", page.getPageSize());
-			params.put("pageNo", page.getPageNo());
 			log.setSearchAreaType(seType);
 			// 判断请求参数
 			// 查询国家
@@ -473,11 +471,11 @@ public class ReportController extends BaseController {
 			Map<String, String> noExportMap = new HashMap<String, String>();
 			// ---------------------------
 			PageLog<NtcURLReport> page = new PageLog<NtcURLReport>(request, response);
-			page.setPageNo(1);
-			page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
+			//page.setPageNo(1);
+			page.setPageSize(-1);
 			Map<String, Object> params = new HashMap<String, Object>();
 			params.put("pageSize", page.getPageSize());
-			params.put("pageNo", page.getPageNo());
+			//params.put("pageNo", page.getPageNo());
 			// 判断请求参数
 			if (StringUtils.isNotBlank(log.getSearchReportStartTime())
 					&& StringUtils.isNotBlank(log.getSearchReportEndTime())) {