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 34f57e14..c54bc645 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 @@ -48,7 +48,7 @@ public class UserInfoService implements UserDetailsService { if(userInfo.getUserNm()!=null){ savedInfo.setUserNm(userInfo.getUserNm()); } - if(userInfo.getPassword()!=null){ + if(userInfo.getPassword()!=null && userInfo.getPassword()!=null){ savedInfo.setPassword(convertPassword(userInfo.getPassword())); } if(userInfo.getPhoneNo()!=null){ diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html index 5e53fb31..730a077e 100644 --- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html +++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html @@ -6,6 +6,8 @@