From 992cec2a177c3f9cd3a98f9ddab1f8206ad1148b Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 10 Jul 2018 14:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=88=97=E8=A1=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=AA=E6=9F=A5=E8=AF=A2function=5Fservice=5Fdict?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BB=96=E5=B1=9E=E6=80=A7=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/controller/BaseController.java    | 10 ----------
 .../nis/web/controller/report/ReportController.java    |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 21e4a574b..56e7bb5df 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -335,16 +335,6 @@ public class BaseController {
 		model.addAttribute("serviceList", serviceList);
 	}
 	protected void initReportCondition(Model model,SearchReport report){
-		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
-		model.addAttribute("requestInfos", requestInfos);
-		List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
-		model.addAttribute("fls", fls);
-		List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
-		model.addAttribute("xzs", xzs);
-		List<ServiceDictInfo> lables=serviceDictInfoService.findAllLableDict();
-		model.addAttribute("lables", lables);
-		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(report.getFunctionId());
-		model.addAttribute("regionList", regionList);
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(report.getFunctionId());
 		model.addAttribute("serviceList", serviceList);
 	}
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 deb5426c3..53728d4ee 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";
 	}
 }