diff --git a/build.gradle b/build.gradle index 74717ab8..3c536fbd 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,8 @@ dependencies { annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor:2.7.2' annotationProcessor 'org.projectlombok:lombok:1.18.24' - //crosseditor 요구 라이브러리 + //crossEditor 요구 라이브러리 + //implementation files('libs/commons-codec-1.15.jar') // 이미 추가되어 있어서 제외. implementation files('libs/commons-fileupload-1.4.jar') implementation files('libs/commons-io-2.11.0.jar') implementation files('libs/java-json.jar') diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java index 57fb9ee6..036b7c68 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java @@ -27,7 +27,7 @@ public class MyInfoController { private final KwmsService kwmsService; @GetMapping("/myInfoPage") - public ModelAndView myInfoPage(@AuthenticationPrincipal UserInfo loginUser){ + public ModelAndView myInfoPage(@AuthenticationPrincipal UserInfo loginUser, String activeTab){ ModelAndView mav = new ModelAndView("user/myInfo"); mav.addObject("userInfo", userInfoService.selectUserInfo(loginUser.getUserSeq())); mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); @@ -37,6 +37,7 @@ public class MyInfoController { mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC")); + mav.addObject("activeTab", activeTab); mav.addObject("dashboardConfigList", userInfoService.getDashboardConfigList(loginUser.getUserSeq())); return mav; diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index 92873476..c3ad2b9c 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -7,7 +7,12 @@