diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java index 3a7c072b..3650a82a 100644 --- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -61,7 +61,7 @@ public class KwmsController { mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); mav.addObject("seriesList", codeMgtService.selectCodeMgtList(userInfo.getOutturnCd())); mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); - mav.addObject("eduGrdList", codeMgtService.selectCodeMgtList("EDU")); + mav.addObject("eduGrdList", codeMgtService.selectCodeMgtList("UED")); }else{ mav.addObject("joinFlag", "F"); mav.addObject("userInfo", empInfo); diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java index cfadcb95..86637ec2 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java @@ -51,14 +51,6 @@ public class UserMgtController { @GetMapping("/userEditModal") public ModelAndView userEditModal(UserInfo userInfo){ ModelAndView mav = new ModelAndView("adminPage/userMgt/userEditModal"); - 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("userInfo", userInfoService.selectUserInfo(userInfo.getUserSeq())); return mav; } diff --git a/src/main/resources/static/js/userMgt/userMgt.js b/src/main/resources/static/js/userMgt/userMgt.js index 56497068..6b23930f 100644 --- a/src/main/resources/static/js/userMgt/userMgt.js +++ b/src/main/resources/static/js/userMgt/userMgt.js @@ -169,7 +169,9 @@ function saveUserInfo(){ } if(confirm(actionMsg+"하시겠습니까?")){ contentFade("in"); - const formData = new FormData($("#userInfoUpdate")[0]); + const form = $("#userInfoUpdate") + form.find('input, select').removeAttr("disabled"); + const formData = new FormData(form[0]); $.ajax({ type : 'POST', data : formData, diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html index 47170927..aa9d26c4 100644 --- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html +++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html @@ -29,148 +29,177 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
- -
- -
- -
- -
+
+
-
+
+ +
+ +
+ +
+ +
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- -
+ +
-
-
-
+
-
+
-
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +