diff --git a/src/main/java/com/no1/wms/account/AccountMapper.java b/src/main/java/com/no1/wms/account/AccountMapper.java index 2a72779..af4be4f 100644 --- a/src/main/java/com/no1/wms/account/AccountMapper.java +++ b/src/main/java/com/no1/wms/account/AccountMapper.java @@ -17,6 +17,7 @@ public interface AccountMapper { int insertToAuthority(AuthorityDto dto); int update(AccountDto dto); + int updateIncludePassword(AccountDto dto); AccountDto selectById(AccountDto dto); diff --git a/src/main/java/com/no1/wms/account/AccountService.java b/src/main/java/com/no1/wms/account/AccountService.java index cf196c5..ca33d81 100644 --- a/src/main/java/com/no1/wms/account/AccountService.java +++ b/src/main/java/com/no1/wms/account/AccountService.java @@ -24,6 +24,9 @@ public class AccountService { public int update(AccountDto dto){ return mapper.update(dto); } + public int updateIncludePassword(AccountDto dto) { + return mapper.updateIncludePassword(dto); + } public AccountDto selectById(AccountDto dto){ return mapper.selectById(dto); diff --git a/src/main/java/com/no1/wms/mypage/MypageController.java b/src/main/java/com/no1/wms/mypage/MypageController.java index 9ed6789..3e87011 100644 --- a/src/main/java/com/no1/wms/mypage/MypageController.java +++ b/src/main/java/com/no1/wms/mypage/MypageController.java @@ -83,7 +83,7 @@ public class MypageController { @ResponseBody @PutMapping("/mypage/updateUserInfo") public boolean updateUserInfo(AccountDto dto) { - int i = accountService.update(dto); + int i = accountService.updateIncludePassword(dto); System.out.println(i); if (i == 1) { return true; diff --git a/src/main/resources/mappers/AccountMapper.xml b/src/main/resources/mappers/AccountMapper.xml index fa099aa..eacb04b 100644 --- a/src/main/resources/mappers/AccountMapper.xml +++ b/src/main/resources/mappers/AccountMapper.xml @@ -137,6 +137,22 @@ activation = #{activation} WHERE id = #{id} + + update account SET + name = #{name}, + password = #{password}, + employee_number = #{employeeNumber}, + email = #{email}, + personal_authority_id = #{personalAuthorityId}, + gender = #{gender}, + birth = #{birth}, + telephone = #{telephone}, + address = #{address}, + department_id = #{departmentId}, + position_id = #{positionId}, + activation = #{activation} + WHERE id = #{id} + update account SET activation = false WHERE id = #{id} diff --git a/src/main/webapp/WEB-INF/views/mypage/mypage.jsp b/src/main/webapp/WEB-INF/views/mypage/mypage.jsp index ec5136c..7592756 100644 --- a/src/main/webapp/WEB-INF/views/mypage/mypage.jsp +++ b/src/main/webapp/WEB-INF/views/mypage/mypage.jsp @@ -145,6 +145,7 @@ $("#submitBtn").on("click",function(){ // var name = $("#name").val(); + var password = $("#password").val(); var employeeNumber = $("#employeeNumber").val(); var email = $("#email").val(); var personalAuthorityId = $("#personalAuthorityId").val(); @@ -158,6 +159,7 @@ var activation = true; const data = { name : name, + password : password, employeeNumber : employeeNumber, email : email, personalAuthorityId : personalAuthorityId,