From f46cb6ca72fe3e2a3cb7d6b03ab19687fc0dbbb6 Mon Sep 17 00:00:00 2001
From: Rinjae <dearmai@dearmai.net>
Date: Tue, 21 Oct 2025 10:58:38 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88=ED=98=B8?=
 =?UTF-8?q?=20=EC=A4=91=EB=B3=B5=20=EB=AC=B4=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/facade/OrgRegisterFacadeImpl.java    | 28 +++++++++++--------
 .../portal/config/PasswordEncoderConfig.java  |  1 -
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java b/src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java
index 715d2bc..6868743 100644
--- a/src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java
+++ b/src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java
@@ -23,16 +23,6 @@ import com.eactive.apim.portal.portaluser.event.UserEmailActivationEvent;
 import com.eactive.apim.portal.portaluser.repository.PortalUserRepository;
 import com.eactive.apim.portal.template.service.MessageHandlerService;
 import com.eactive.apim.portal.template.service.MessageRecipient;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
 import lombok.RequiredArgsConstructor;
 import org.apache.xerces.impl.dv.util.Base64;
 import org.springframework.http.ResponseEntity;
@@ -41,6 +31,18 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
+
 @Service
 @RequiredArgsConstructor
 public class OrgRegisterFacadeImpl implements OrgRegisterFacade {
@@ -72,9 +74,11 @@ public class OrgRegisterFacadeImpl implements OrgRegisterFacade {
             return new ValidationResponse(false, "입력 정보가 올바르지 않습니다.");
         }
 
-        PortalUser existingUser = portalUserRepository.findByUserNameAndMobileNumber(orgDTO.getUserName(), orgDTO.getMobileNumber());
+        // 2025.10.20 - 휴대폰 번호 중복 무시
+//        PortalUser existingUser = portalUserRepository.findByUserNameAndMobileNumber(orgDTO.getUserName(), orgDTO.getMobileNumber());
+        Optional<PortalUser> existingUser = portalUserRepository.findByUserName(orgDTO.getUserName());
 
-        if(existingUser != null) {
+        if(existingUser.isPresent()) {
             return new ValidationResponse(false, "가입된 계정이 이미 존재합니다.");
         }
 
diff --git a/src/main/java/com/eactive/apim/portal/config/PasswordEncoderConfig.java b/src/main/java/com/eactive/apim/portal/config/PasswordEncoderConfig.java
index 8e77a31..d7722b4 100644
--- a/src/main/java/com/eactive/apim/portal/config/PasswordEncoderConfig.java
+++ b/src/main/java/com/eactive/apim/portal/config/PasswordEncoderConfig.java
@@ -4,7 +4,6 @@ import com.eactive.apim.portal.custom.config.KjbPasswordEncoder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.crypto.password.StandardPasswordEncoder;
 
 @Configuration
 public class PasswordEncoderConfig {