From 36af4dae920bef7e0821f38c65d788f2655a6a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 22 Feb 2023 12:00:08 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=96=91?= =?UTF-8?q?=EC=8B=9D=20=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/userInfo/MyInfoController.java | 8 -- .../userInfo/service/UserInfoService.java | 58 +++++--- src/main/resources/static/js/user/info.js | 4 +- src/main/resources/templates/user/myInfo.html | 130 +++++++++++------- 4 files changed, 120 insertions(+), 80 deletions(-) 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 4619bb54..c1b026da 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java @@ -30,15 +30,7 @@ public class MyInfoController { 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")); - mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); - mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); - mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); - 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/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java index 95301ded..5d701c0e 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java @@ -8,6 +8,7 @@ import com.dbnt.faisp.main.userInfo.model.*; import com.dbnt.faisp.main.userInfo.repository.*; import com.dbnt.faisp.util.ParamMap; +import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; @@ -51,69 +52,84 @@ public class UserInfoService implements UserDetailsService { public void updateUserInfo(UserInfo loginUser,UserInfo userInfo){ UserInfo savedInfo = userInfoRepository.findById(userInfo.getUserSeq()).orElse(null); if(savedInfo!=null){ - if(!ObjectUtils.isEmpty(userInfo.getDicCode())){ + if(!Utils.isEmpty(userInfo.getDicCode())){ savedInfo.setDicCode(userInfo.getDicCode()); } - if(!ObjectUtils.isEmpty(userInfo.getUserNm())){ + if(!Utils.isEmpty(userInfo.getUserNm())){ savedInfo.setUserNm(userInfo.getUserNm()); } - if(!ObjectUtils.isEmpty(userInfo.getPassword())){ + if(!Utils.isEmpty(userInfo.getPassword())){ savedInfo.setPassword(convertPassword(userInfo.getPassword())); } - if(!ObjectUtils.isEmpty(userInfo.getPhoneNo())){ + if(!Utils.isEmpty(userInfo.getPhoneNo())){ savedInfo.setPhoneNo(userInfo.getPhoneNo()); } - if(!ObjectUtils.isEmpty(userInfo.getEmail())){ + if(!Utils.isEmpty(userInfo.getEmail())){ savedInfo.setEmail(userInfo.getEmail()); } - if(!ObjectUtils.isEmpty(userInfo.getSex())){ + if(!Utils.isEmpty(userInfo.getSex())){ savedInfo.setSex(userInfo.getSex()); } - if(!ObjectUtils.isEmpty(userInfo.getOgCd())){ + if(!Utils.isEmpty(userInfo.getOgCd())){ savedInfo.setOgCd(userInfo.getOgCd()); } - if(!ObjectUtils.isEmpty(userInfo.getOfcCd())){ + if(!Utils.isEmpty(userInfo.getOfcCd())){ savedInfo.setOfcCd(userInfo.getOfcCd()); } - if(!ObjectUtils.isEmpty(userInfo.getTitleCd())){ + if(!Utils.isEmpty(userInfo.getTitleCd())){ savedInfo.setTitleCd(userInfo.getTitleCd()); } - if(!ObjectUtils.isEmpty(userInfo.getOutturnCd())){ + if(!Utils.isEmpty(userInfo.getOutturnCd())){ savedInfo.setOutturnCd(userInfo.getOutturnCd()); } - if(!ObjectUtils.isEmpty(userInfo.getSeriesCd())){ + if(!Utils.isEmpty(userInfo.getSeriesCd())){ savedInfo.setSeriesCd(userInfo.getSeriesCd()); } - if(!ObjectUtils.isEmpty(userInfo.getBirthDate())){ + if(!Utils.isEmpty(userInfo.getBirthDate())){ savedInfo.setBirthDate(userInfo.getBirthDate()); } - if(!ObjectUtils.isEmpty(userInfo.getPoliceInDate())){ + if(!Utils.isEmpty(userInfo.getPoliceInDate())){ savedInfo.setPoliceInDate(userInfo.getPoliceInDate()); } - if(!ObjectUtils.isEmpty(userInfo.getOrganInDate())){ + if(!Utils.isEmpty(userInfo.getOrganInDate())){ savedInfo.setOrganInDate(userInfo.getOrganInDate()); } - if(!ObjectUtils.isEmpty(userInfo.getOfcInDate())){ + if(!Utils.isEmpty(userInfo.getOfcInDate())){ savedInfo.setOfcInDate(userInfo.getOfcInDate()); } - if(!ObjectUtils.isEmpty(userInfo.getTitleInDate())){ + if(!Utils.isEmpty(userInfo.getTitleInDate())){ savedInfo.setTitleInDate(userInfo.getTitleInDate()); } - if(!ObjectUtils.isEmpty(userInfo.getLanguageCd())){ + if(!Utils.isEmpty(userInfo.getLanguageCd())){ savedInfo.setLanguageCd(userInfo.getLanguageCd()); } - if(!ObjectUtils.isEmpty(userInfo.getOfcHeadYn())){ + if(!Utils.isEmpty(userInfo.getOfcHeadYn())){ savedInfo.setOfcHeadYn(userInfo.getOfcHeadYn()); } - if(!ObjectUtils.isEmpty(userInfo.getUserRole())){ + if(!Utils.isEmpty(userInfo.getUserRole())){ savedInfo.setUserRole(userInfo.getUserRole()); } - if(!ObjectUtils.isEmpty(userInfo.getUserStatus())){ + if(!Utils.isEmpty(userInfo.getUserStatus())){ savedInfo.setUserStatus(userInfo.getUserStatus()); } - if(!ObjectUtils.isEmpty(userInfo.getDutyCd())){ + if(!Utils.isEmpty(userInfo.getDutyCd())){ savedInfo.setDutyCd(userInfo.getDutyCd()); } + if(!Utils.isEmpty(userInfo.getUseLanguage())){ + savedInfo.setUseLanguage(userInfo.getUseLanguage()); + } + if(!Utils.isEmpty(userInfo.getLanguageGrd())){ + savedInfo.setLanguageGrd(userInfo.getLanguageGrd()); + } + if(!Utils.isEmpty(userInfo.getEducationGrd())){ + savedInfo.setEducationGrd(userInfo.getEducationGrd()); + } + if(!Utils.isEmpty(userInfo.getSchool())){ + savedInfo.setSchool(userInfo.getSchool()); + } + if(!Utils.isEmpty(userInfo.getSpecialism())){ + savedInfo.setSpecialism(userInfo.getSpecialism()); + } userInfoRepository.save(savedInfo); saveUserInfoHistory(savedInfo, loginUser); } diff --git a/src/main/resources/static/js/user/info.js b/src/main/resources/static/js/user/info.js index 17cb3da5..b45ee4f1 100644 --- a/src/main/resources/static/js/user/info.js +++ b/src/main/resources/static/js/user/info.js @@ -20,7 +20,9 @@ $(function (){ }) $(document).on('click', '#updateBtn', function (){ if(confirm("저장하시겠습니까?")){ - const formData = new FormData($("#userInfoUpdate")[0]); + const form = $("#userInfoUpdate"); + form.find('input, select').removeAttr('disabled'); + const formData = new FormData(form[0]); let flag = true const passwordChange = $("#passwordChange"); if(passwordChange.val()){ diff --git a/src/main/resources/templates/user/myInfo.html b/src/main/resources/templates/user/myInfo.html index fe01903f..9ed5b16e 100644 --- a/src/main/resources/templates/user/myInfo.html +++ b/src/main/resources/templates/user/myInfo.html @@ -36,10 +36,12 @@
-
+
-
- +
+ +
+
@@ -55,115 +57,111 @@
-
- - +
+
-
- +
+
- -
+ +
-
-
+
-
- -
- -
- -
- -
-
-
-
+ +
+ +
+ +
+ +
-
- +
+
-
- +
+
-
- - +
-
+
-
- - +
-
- +
+
-
- - +
-
- +
+
-
- - +
-
+
@@ -171,14 +169,46 @@
-
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +