From 256a9f0cbff4c26df39ccfd1dcdd227ca29b0ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 7 Nov 2022 14:04:01 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EA=B8=B0=EB=8A=A5>=EC=99=B8?=
 =?UTF-8?q?=EC=82=AC=EA=B2=BD=EC=B0=B0=EA=B4=80=EB=A6=AC=20form=EC=97=90?=
 =?UTF-8?q?=20csrf=ED=86=A0=ED=81=B0=20=EB=88=84=EB=9D=BD=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=EC=8B=9C?=
 =?UTF-8?q?=20=EB=B9=84=EC=96=B4=EC=9E=88=EB=8A=94=20=EB=B9=84=EB=B0=80?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=20=ED=99=95=EC=9D=B8=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dbnt/faisp/main/userInfo/service/UserInfoService.java   | 2 +-
 .../resources/templates/adminPage/userMgt/userEditModal.html    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 @@
 </div>
 <div class="modal-body">
   <form id="userInfoUpdate" action="#" method="post">
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <input type="hidden" name="userSeq" id="userSeq" class="userSeq" th:value="${userInfo.userSeq}">
     <input type="hidden" name="userStatus" th:value="${userInfo.userStatus}">
     <div class="mb-3 mt-3 row">