From e46bdafa648d76b24b84a856678f6c076df0d6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 8 May 2023 12:02:17 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=98=EC=95=88=EC=88=98=EC=9A=94=EB=B6=84?= =?UTF-8?q?=EC=84=9D=EA=B2=B0=EA=B3=BC=20=EC=A1=B0=ED=9A=8C=EB=AA=A8?= =?UTF-8?q?=EB=8B=AC=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CounterIntelligenceController.java | 20 +++++++++---------- ...dal.html => ciaSafetyDemandViewModal.html} | 0 2 files changed, 10 insertions(+), 10 deletions(-) rename src/main/resources/templates/counterIntelligence/{ciaSafetyDemandviewModal.html => ciaSafetyDemandViewModal.html} (100%) diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java index 0d57c4de..a0658b9d 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java @@ -223,19 +223,19 @@ public class CounterIntelligenceController { @GetMapping("/ciaEditModal") public ModelAndView ciaEditModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = null; + ModelAndView mav = new ModelAndView(); switch (cia.getCiType()){ case "SDI": - mav = new ModelAndView("counterIntelligence/ciaSafetyDemandEditModal"); + mav.setViewName("counterIntelligence/ciaSafetyDemandEditModal"); break; case "MCI": - mav = new ModelAndView("counterIntelligence/ciaManageCompanyEditModal"); + mav.setViewName("counterIntelligence/ciaManageCompanyEditModal"); break; case "FI": - mav = new ModelAndView("counterIntelligence/ciaForeignerEditModal"); + mav.setViewName("counterIntelligence/ciaForeignerEditModal"); break; case "EI": - mav = new ModelAndView("counterIntelligence/ciaEduEditModal"); + mav.setViewName("counterIntelligence/ciaEduEditModal"); break; } mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); @@ -245,26 +245,26 @@ public class CounterIntelligenceController { @GetMapping("/ciaViewModal") public ModelAndView ciaViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ - ModelAndView mav = null; + ModelAndView mav = new ModelAndView(); String accessAuth = null; switch (cia.getCiType()){ case "SDI": - mav = new ModelAndView("counterIntelligence/ciaSafetyDemandViewModal"); + mav.setViewName("counterIntelligence/ciaSafetyDemandViewModal"); accessAuth = authMgtService.selectAccessConfigList (loginUser.getUserSeq(), "/counterIntelligence/ciaSafetyDemandList").get(0).getAccessAuth(); break; case "MCI": - mav = new ModelAndView("counterIntelligence/ciaManageCompanyViewModal"); + mav.setViewName("counterIntelligence/ciaManageCompanyViewModal"); accessAuth = authMgtService.selectAccessConfigList (loginUser.getUserSeq(), "/counterIntelligence/ciaManageCompanyList").get(0).getAccessAuth(); break; case "FI": - mav = new ModelAndView("counterIntelligence/ciaForeignerViewModal"); + mav.setViewName("counterIntelligence/ciaForeignerViewModal"); accessAuth = authMgtService.selectAccessConfigList (loginUser.getUserSeq(), "/counterIntelligence/ciaForeignerList").get(0).getAccessAuth(); break; case "EI": - mav = new ModelAndView("counterIntelligence/ciaEduViewModal"); + mav.setViewName("counterIntelligence/ciaEduViewModal"); accessAuth = authMgtService.selectAccessConfigList (loginUser.getUserSeq(), "/counterIntelligence/ciaEduList").get(0).getAccessAuth(); break; diff --git a/src/main/resources/templates/counterIntelligence/ciaSafetyDemandviewModal.html b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandViewModal.html similarity index 100% rename from src/main/resources/templates/counterIntelligence/ciaSafetyDemandviewModal.html rename to src/main/resources/templates/counterIntelligence/ciaSafetyDemandViewModal.html