Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP

정보 수정시 비어있는 비밀번호 확인 수정.

src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java

@@ -91,7 +91,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){

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">