From 4f17dbdb8026d14306963c14a19d4f89c6bcb879 Mon Sep 17 00:00:00 2001 From: Hyung Geun Date: Thu, 28 Apr 2022 09:21:55 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=ED=86=B5=EA=B3=84=20?= =?UTF-8?q?=EC=97=91=EC=85=80=20=EC=88=98=EC=A0=95=EC=A4=91..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/web/ReportStatsController.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/kcg/faics/report/web/ReportStatsController.java b/src/main/java/kcg/faics/report/web/ReportStatsController.java index 3f77fdc..4513575 100644 --- a/src/main/java/kcg/faics/report/web/ReportStatsController.java +++ b/src/main/java/kcg/faics/report/web/ReportStatsController.java @@ -205,19 +205,26 @@ public class ReportStatsController { if ("C".equals(searchVO.getStatsType())) { header.put("placename", messageSource.getMessage("report.view.division", null, locale)); header.put("total", messageSource.getMessage("report.stats.total", null, locale)); - for (String category : reportSearchVO.getCategory1()) { - header.put(category + "_1", messageSource.getMessage("report.category." + category + "_1", null, locale)); + if(reportSearchVO.getCategory1()!=null){ + for (String category : reportSearchVO.getCategory1()) { + header.put(category + "_1", messageSource.getMessage("report.category." + category + "_1", null, locale)); + } } - for (String category : reportSearchVO.getCategory2()) { - header.put(category + "_2", messageSource.getMessage("report.category." + category + "_2", null, locale)); + if(reportSearchVO.getCategory2()!=null) { + for (String category : reportSearchVO.getCategory2()) { + header.put(category + "_2", messageSource.getMessage("report.category." + category + "_2", null, locale)); + } } - for (String category : reportSearchVO.getCategory3()) { - header.put(category + "_3", messageSource.getMessage("report.category." + category + "_3", null, locale)); + if(reportSearchVO.getCategory3()!=null) { + for (String category : reportSearchVO.getCategory3()) { + header.put(category + "_3", messageSource.getMessage("report.category." + category + "_3", null, locale)); + } } - for (String category : reportSearchVO.getCategory4()) { - header.put(category + "_4", messageSource.getMessage("report.category." + category + "_4", null, locale)); + if(reportSearchVO.getCategory4()!=null) { + for (String category : reportSearchVO.getCategory4()) { + header.put(category + "_4", messageSource.getMessage("report.category." + category + "_4", null, locale)); + } } - try { Date d = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); @@ -289,4 +296,4 @@ public class ReportStatsController { return "excelView"; } -} +} \ No newline at end of file