From e023d4828cc139655f17922c3edb1246542ef6ed Mon Sep 17 00:00:00 2001
From: Rinjae <dearmai@dearmai.net>
Date: Fri, 21 Nov 2025 12:06:16 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=A8=EC=8A=A4=EC=9B=8C=EB=93=9C=20?=
 =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=EC=8B=9C=20=EC=9E=A0=EA=B8=88=20?=
 =?UTF-8?q?=ED=95=B4=EC=A0=9C=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/login/controller/AccountRecoveryController.java     | 2 +-
 .../apim/portal/apps/user/service/PortalUserAuthService.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/eactive/apim/portal/apps/login/controller/AccountRecoveryController.java b/src/main/java/com/eactive/apim/portal/apps/login/controller/AccountRecoveryController.java
index 433870d..4d6030e 100644
--- a/src/main/java/com/eactive/apim/portal/apps/login/controller/AccountRecoveryController.java
+++ b/src/main/java/com/eactive/apim/portal/apps/login/controller/AccountRecoveryController.java
@@ -119,7 +119,7 @@ public class AccountRecoveryController {
 
         try {
             // 사용자 정보 확인
-            portalUserAuthService.initializePassword(
+            portalUserAuthService.resetPassword(
                     passwordReset.getLoginId(),
                     passwordReset.getUserName(),
                     passwordReset.getMobileNumber()
diff --git a/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java b/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java
index 3ec73a5..94fe33a 100644
--- a/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java
+++ b/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java
@@ -94,13 +94,16 @@ public class PortalUserAuthService implements UserDetailsService {
         return portalUserRepository.findPortalUserByEmailAddr(emailAddr).orElseThrow(() -> new UserNotFoundException("USER_NOT_FOUND_MESSAGE"));
     }
 
-    public void initializePassword(String loginId, String userName, String mobileNumber) {
+    public void resetPassword(String loginId, String userName, String mobileNumber) {
 
         PortalUser portalUser = portalUserRepository.findByLoginIdAndUserNameAndMobileNumber(loginId, userName, mobileNumber)
                 .orElseThrow(() -> new UserNotFoundException("일치하는 사용자 정보를 찾을 수 없습니다."));
 
         String tempPassword = EncryptionUtil.generateNewPasswordForKjbank(loginId);
         portalUser.setPasswordHash(passwordEncoder.encode(tempPassword));
+        if ("Y".equalsIgnoreCase(portalUser.getAccountLockYn())) {
+            portalUser.setAccountLockYn("N");
+        }
 
         portalUserRepository.save(portalUser);
         HashMap<String, Object> params = new HashMap<>();