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 917faa08..07a8a35e 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 @@ -39,9 +39,67 @@ public class UserInfoService implements UserDetailsService { return userInfoRepository.save(userInfo).getUserId(); } @Transactional - public String updateUserInfo(UserInfo userInfo){ - userInfo.setPassword(convertPassword(userInfo.getPassword())); - return userInfoRepository.save(userInfo).getUserId(); + public void updateUserInfo(UserInfo userInfo){ + UserInfo savedInfo = userInfoRepository.findById(userInfo.getUserSeq()).orElse(null); + if(savedInfo!=null){ + if(userInfo.getUserNm()!=null){ + savedInfo.setUserNm(userInfo.getUserNm()); + } + if(userInfo.getPassword()!=null){ + savedInfo.setPassword(convertPassword(userInfo.getPassword())); + } + if(userInfo.getPhoneNo()!=null){ + savedInfo.setPhoneNo(userInfo.getPhoneNo()); + } + if(userInfo.getEmail()!=null){ + savedInfo.setEmail(userInfo.getEmail()); + } + if(userInfo.getSex()!=null){ + savedInfo.setSex(userInfo.getSex()); + } + if(userInfo.getOgCd()!=null){ + savedInfo.setOgCd(userInfo.getOgCd()); + } + if(userInfo.getOfcCd()!=null){ + savedInfo.setOfcCd(userInfo.getOfcCd()); + } + if(userInfo.getTitleCd()!=null){ + savedInfo.setTitleCd(userInfo.getTitleCd()); + } + if(userInfo.getOutturnCd()!=null){ + savedInfo.setOutturnCd(userInfo.getOutturnCd()); + } + if(userInfo.getSeriesCd()!=null){ + savedInfo.setSeriesCd(userInfo.getSeriesCd()); + } + if(userInfo.getBirthDate()!=null){ + savedInfo.setBirthDate(userInfo.getBirthDate()); + } + if(userInfo.getPoliceInDate()!=null){ + savedInfo.setPoliceInDate(userInfo.getPoliceInDate()); + } + if(userInfo.getOrganInDate()!=null){ + savedInfo.setOrganInDate(userInfo.getOrganInDate()); + } + if(userInfo.getOfcInDate()!=null){ + savedInfo.setOfcInDate(userInfo.getOfcInDate()); + } + if(userInfo.getTitleInDate()!=null){ + savedInfo.setTitleInDate(userInfo.getTitleInDate()); + } + if(userInfo.getLanguageCd()!=null){ + savedInfo.setLanguageCd(userInfo.getLanguageCd()); + } + if(userInfo.getOfcHeadYn()!=null){ + savedInfo.setOfcHeadYn(userInfo.getOfcHeadYn()); + } + if(userInfo.getUserRole()!=null){ + savedInfo.setUserRole(userInfo.getUserRole()); + } + if(userInfo.getUserStatus()!=null){ + savedInfo.setUserStatus(userInfo.getUserStatus()); + } + } } public String updatePassword(UserInfo loginUser, UserInfo modifyInfo){ @@ -107,12 +165,6 @@ public class UserInfoService implements UserDetailsService { } return cnt; } - @Transactional - public void updateUser(UserInfo userInfo) { - UserInfo dbUserInfo = userInfoRepository.findById(userInfo.getUserSeq()).orElse(null); - dbUserInfo.setUserRole(userInfo.getUserRole()); - userInfoRepository.save(dbUserInfo); - } public void userDelete(List userInfo) { userInfoRepository.deleteAll(userInfo); } 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 5897327e..ed3cd5de 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/userMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/userMgtController.java @@ -1,5 +1,6 @@ package com.dbnt.faisp.main.userInfo; +import com.dbnt.faisp.kwms.service.KwmsService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.userInfo.service.UserInfoService; import com.dbnt.faisp.main.userInfo.model.UserInfo; @@ -18,6 +19,7 @@ public class userMgtController { private final UserInfoService userInfoService; private final CodeMgtService codeMgtService; + private final KwmsService kwmsService; @GetMapping("/userMgtPage") public ModelAndView codeMgtPage(UserInfo userInfo) { @@ -62,7 +64,7 @@ public class userMgtController { @PostMapping("/updateUserInfo") public void updateUserInfo(UserInfo userInfo) { - userInfoService.updateUser(userInfo); + userInfoService.updateUserInfo(userInfo); } @PostMapping("/userDelete") @@ -71,4 +73,17 @@ public class userMgtController { userInfoService.userDelete(userInfo); } + + @PostMapping("/syncUserInfoToKwms") + @ResponseBody + public String syncUserInfoToKwms(@RequestBody List infoList){ + for(UserInfo info: infoList){ + UserInfo kwmsInfo = kwmsService.selectEmpInfo(info.getDicCode()); + if(kwmsInfo!=null){ + kwmsInfo.setUserSeq(info.getUserSeq()); + userInfoService.updateUserInfo(kwmsInfo); + } + } + return ""; + } } diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml index 2d479c42..7bb85eb3 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -33,6 +33,7 @@ - +
@@ -31,7 +31,7 @@
- +
@@ -130,7 +130,7 @@
@@ -150,7 +150,7 @@
diff --git a/src/main/resources/templates/adminPage/userMgt/userMgt.html b/src/main/resources/templates/adminPage/userMgt/userMgt.html index 7e86518f..e8631015 100644 --- a/src/main/resources/templates/adminPage/userMgt/userMgt.html +++ b/src/main/resources/templates/adminPage/userMgt/userMgt.html @@ -82,12 +82,14 @@ 계급 성명 아이디 + 식별번호 등록일 + @@ -123,6 +125,7 @@ +