From 96634ac0bae5bf93b627ade70472e01c433a9392 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 10 Jul 2018 13:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8tab=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/controller/report/ReportController.java   | 2 +-
 src/main/webapp/WEB-INF/views/report/list.jsp                  | 3 ++-
 2 files changed, 3 insertions(+), 2 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 53728d4ee..deb5426c3 100644
--- a/src/main/java/com/nis/web/controller/report/ReportController.java
+++ b/src/main/java/com/nis/web/controller/report/ReportController.java
@@ -16,7 +16,7 @@ import com.nis.web.controller.BaseController;
 public class ReportController extends BaseController {
 	@RequestMapping("/list")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
-		initReportCondition(model, bean);
+//		initReportCondition(model, bean);
 		return "/report/list";
 	}
 }
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 0931f8cff..cb601334f 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -22,7 +22,8 @@
 			$(".Wdate").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
-		if(!"${bean.reportBusinessType}"){
+		if(!"${bean.reportBusinessType}"){//default
+			$("#reportBusinessType").val("label_report");
 			ajaxReport("/report/ajaxNtcTagReport","#label");
 		}else if("${bean.reportBusinessType}"=="label_report"){
 			ajaxReport("/report/ajaxNtcTagReport","#label");