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 requestInfos=requestInfoService.getAllRequestInfo(); - model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findAllFlDict(); - model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findAllXzDict(); - model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findAllLableDict(); - model.addAttribute("lables", lables); - List regionList = DictUtils.getFunctionRegionDictList(report.getFunctionId()); - model.addAttribute("regionList", regionList); List 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"; } }