From 9330763c2cefb759efd9be6ba5784ab2a1367085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Sat, 28 Jan 2023 10:13:26 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.=20=EC=A0=95=EC=9B=90/=ED=98=84=EC=9B=90=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98?= =?UTF-8?q?=EC=98=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/kwms/KwmsController.java | 6 +++- .../repository/UserInfoRepository.java | 1 + .../userInfo/service/UserInfoService.java | 5 ++-- .../resources/static/js/userMgt/userMgt.js | 18 ++++++++---- .../adminPage/userMgt/userEditModal.html | 2 +- .../resources/templates/login/joinForm.html | 1 + .../personnelStatus/personnelStatus.html | 28 +++++++++---------- 7 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java index d0924bd5..053c3e3d 100644 --- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -29,13 +29,17 @@ public class KwmsController { mav.addObject("userInfo", empInfo); mav.addObject("msg", "-포함 입력 ex) M00-00000"); }else{ - if(userInfoService.selectUserInfoToDicCode(empInfo.getDic()) == null){ + UserInfo savedUser = userInfoService.selectUserInfoToDicCode(empInfo.getDic()); + if(savedUser == null || savedUser.getUserStatus().equals("USC004")){ UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDic()); if(userInfo==null){ mav.addObject("joinFlag", "F"); mav.addObject("userInfo", empInfo); mav.addObject("msg", "검색 결과가 없습니다."); }else{ + if(savedUser.getUserStatus().equals("USC004")){ + userInfo.setUserSeq(savedUser.getUserSeq()); + } mav.addObject("joinFlag", "T"); mav.addObject("userInfo", userInfo); mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInfoRepository.java b/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInfoRepository.java index 24aeb366..1c829cad 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInfoRepository.java @@ -14,6 +14,7 @@ public interface UserInfoRepository extends JpaRepository { Optional findByUserSeq(Integer userSeq); Optional findByDicCode(String dicCode); + Optional findByDicCodeAndUserStatus(String dicCode, String userStatus); @Query(value = "SELECT user_status FROM user_info WHERE user_seq=:userSeq", nativeQuery = true) String getUserStatus(@Param("userSeq") Integer userSeq); 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 826bf192..113c07f8 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 @@ -35,7 +35,8 @@ public class UserInfoService implements UserDetailsService { @Transactional public String insertUserInfo(UserInfo userInfo){ - if(userInfoRepository.findByUserId(userInfo.getUserId()).orElse(null) != null){ + UserInfo savedUser = userInfoRepository.findByUserId(userInfo.getUserId()).orElse(null); + if(savedUser != null && savedUser.getUserStatus().equals("USC003")){ return "userIdDuplication"; } userInfo.setUserRole(Role.USER.getValue()); @@ -43,7 +44,7 @@ public class UserInfoService implements UserDetailsService { userInfo.setPassword(convertPassword(userInfo.getPassword())); userInfo.setWrtDt(LocalDateTime.now()); UserInfo result = userInfoRepository.save(userInfo); - saveUserInfoHistory(result, result); + saveUserInfoHistory(savedUser==null?result:savedUser, result); return result.getUserId(); } @Transactional diff --git a/src/main/resources/static/js/userMgt/userMgt.js b/src/main/resources/static/js/userMgt/userMgt.js index 7a9b4a1c..56497068 100644 --- a/src/main/resources/static/js/userMgt/userMgt.js +++ b/src/main/resources/static/js/userMgt/userMgt.js @@ -51,9 +51,11 @@ $(document).on('click', '#updateBtn', function (){ }) $(document).on('click', '#deleteBtn', function (){ - if(confirm("삭제 하시겠습니까?")){ + /*if(confirm("삭제 하시겠습니까?")){ deleteUser([{userSeq: Number($("#userSeq").val())}]) - } + }*/ + $("#editModalUserStatus").val('USC004'); + saveUserInfo(); }) $(document).on('click', '#syncToKwmsBtn', function (){ const dicCode = $("#dicCode").val(); @@ -159,7 +161,13 @@ function userCompanion(checkArr){ function saveUserInfo(){ - if(confirm("저장하시겠습니까?")){ + let actionMsg = ""; + if($("#editModalUserStatus").val()==="USC004"){ + actionMsg = "삭제" + }else{ + actionMsg = "저장" + } + if(confirm(actionMsg+"하시겠습니까?")){ contentFade("in"); const formData = new FormData($("#userInfoUpdate")[0]); $.ajax({ @@ -169,12 +177,12 @@ function saveUserInfo(){ processData: false, contentType: false, success : function() { - alert("저장되었습니다."); + alert(actionMsg+"되었습니다."); contentFade("out"); location.reload(); }, error : function(xhr, status) { - alert("저장에 실패하였습니다."); + alert(actionMsg+"에 실패하였습니다."); contentFade("out"); } }) diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html index dce007c8..3b911061 100644 --- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html +++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html @@ -10,7 +10,7 @@ - +
diff --git a/src/main/resources/templates/login/joinForm.html b/src/main/resources/templates/login/joinForm.html index 3313b7a1..0c2dc07a 100644 --- a/src/main/resources/templates/login/joinForm.html +++ b/src/main/resources/templates/login/joinForm.html @@ -17,6 +17,7 @@
+
diff --git a/src/main/resources/templates/police/personnelStatus/personnelStatus.html b/src/main/resources/templates/police/personnelStatus/personnelStatus.html index a2bdafc8..186e0615 100644 --- a/src/main/resources/templates/police/personnelStatus/personnelStatus.html +++ b/src/main/resources/templates/police/personnelStatus/personnelStatus.html @@ -64,19 +64,19 @@ - + - + - + - + - + - + - + @@ -90,19 +90,19 @@ - + - + - + - + - + - + - +