From ebb74806128363a814b435ce6595cd63b94b59e6 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 13 Feb 2026 17:23:13 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=95=EC=9D=B8=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EC=A0=84=ED=99=98=20=EC=9A=94=EC=B2=AD=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0=20=EB=B0=8F=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/AccountController.java | 31 ++++++++++++------- .../apps/mypage/UserConversionCompleted.html | 2 +- .../views/apps/mypage/orgTransfer.html | 26 +++------------- .../emailValidationResultCorpManager.html | 2 +- .../register/emailValidationResultUser.html | 2 +- .../views/apps/register/joinCompleted.html | 2 +- 6 files changed, 29 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/eactive/apim/portal/apps/user/controller/AccountController.java b/src/main/java/com/eactive/apim/portal/apps/user/controller/AccountController.java index fec67da..e7dcd34 100644 --- a/src/main/java/com/eactive/apim/portal/apps/user/controller/AccountController.java +++ b/src/main/java/com/eactive/apim/portal/apps/user/controller/AccountController.java @@ -16,7 +16,9 @@ import com.eactive.apim.portal.invitation.repository.UserInvitationRepository; import com.eactive.apim.portal.portaluser.entity.PortalUserEnums; import com.eactive.apim.portal.portaluser.entity.PortalUserEnums.RoleCode; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,6 +38,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -271,18 +274,20 @@ public class AccountController { @PostMapping("/mypage/org-transfer") - public String processOrgTransfer( + @ResponseBody + public Map processOrgTransfer( @ModelAttribute PortalOrgRegistrationDTO orgDTO, @ModelAttribute UserAgreementDTO agreementDTO, HttpServletRequest request, - HttpServletResponse response, - RedirectAttributes redirectAttributes) { + HttpServletResponse response) { + Map result = new HashMap<>(); try { var currentUser = SecurityUtil.getPortalAuthenticatedUser(); if (currentUser.getRoleCode() != PortalUserEnums.RoleCode.ROLE_USER) { - redirectAttributes.addFlashAttribute("error", "잘못된 접근입니다."); - return "redirect:/mypage"; + result.put("status", "ERROR"); + result.put("message", "잘못된 접근입니다."); + return result; } ValidationResponse validationResponse = orgRegisterFacade.convertToOrgUser( @@ -310,16 +315,20 @@ public class AccountController { } } - redirectAttributes.addFlashAttribute("success", validationResponse.getMessage()); - return "apps/mypage/UserConversionCompleted"; + result.put("status", "SUCCESS"); + result.put("message", validationResponse.getMessage()); + result.put("redirectUrl", "/"); + return result; } else { - redirectAttributes.addFlashAttribute("error", validationResponse.getMessage()); - return "redirect:/mypage/org-transfer"; + result.put("status", "ERROR"); + result.put("message", validationResponse.getMessage()); + return result; } } catch (Exception e) { - redirectAttributes.addFlashAttribute("error", "법인회원 전환 중 오류가 발생했습니다: " + e.getMessage()); - return "redirect:/mypage/org-transfer"; + result.put("status", "ERROR"); + result.put("message", "법인회원 전환 중 오류가 발생했습니다: " + e.getMessage()); + return result; } } diff --git a/src/main/resources/templates/views/apps/mypage/UserConversionCompleted.html b/src/main/resources/templates/views/apps/mypage/UserConversionCompleted.html index 9102bfe..802035e 100644 --- a/src/main/resources/templates/views/apps/mypage/UserConversionCompleted.html +++ b/src/main/resources/templates/views/apps/mypage/UserConversionCompleted.html @@ -2,7 +2,7 @@ + layout:decorate="~{layout/kjbank_nohead_layout}">
diff --git a/src/main/resources/templates/views/apps/mypage/orgTransfer.html b/src/main/resources/templates/views/apps/mypage/orgTransfer.html index d370511..f2fa206 100644 --- a/src/main/resources/templates/views/apps/mypage/orgTransfer.html +++ b/src/main/resources/templates/views/apps/mypage/orgTransfer.html @@ -90,11 +90,6 @@ compRegNo: $('#compRegNo').val().trim() !== '', corpRegNo: $('#corpRegNo').val().trim() !== '', orgName: $('#orgName').val().trim() !== '', - ceoName: $('#ceoName').val().trim() !== '', - orgAddr: $('#orgAddr').val().trim() !== '', - orgPhoneNumber: $('#orgPhoneNumber').val().trim() !== '', - scPhoneNumber: $('#scPhoneNumber').val().trim() !== '', - serviceName: $('#serviceName').val().trim() !== '', compRegFile: $('#compRegFile').val().trim() !== '' }; @@ -104,11 +99,6 @@ compRegNo: '사업자등록번호를 입력해주세요.', corpRegNo: '법인등록번호를 입력해주세요.', orgName: '법인명을 입력해주세요.', - ceoName: '대표자 성명을 입력해주세요.', - orgAddr: '사업장 소재지를 입력해주세요.', - orgPhoneNumber: '회사 전화번호를 입력해주세요.', - scPhoneNumber: '고객센터 전화번호를 입력해주세요.', - serviceName: '서비스명을 입력해주세요.', compRegFile: '사업자등록증을 업로드해주세요.' }; @@ -150,18 +140,12 @@ success: function(response) { console.log('폼 제출 성공:', response); - // 응답이 JSON인 경우 - if (typeof response === 'object') { - if (response.status === 'SUCCESS') { - customPopups.showSuccess(response.message || '법인회원 전환 신청이 완료되었습니다.', function() { - window.location.href = /*[[@{/mypage}]]*/ '/mypage'; - }); - } else { - customPopups.showAlert(response.message || '처리 중 오류가 발생했습니다.'); - } + if (response.status === 'SUCCESS') { + customPopups.showAlert(response.message || '법인회원 전환 신청이 완료되었습니다.', function() { + window.location.href = response.redirectUrl || /*[[@{/apps/mypage/UserConversionCompleted}]]*/ '/apps/mypage/UserConversionCompleted'; + }); } else { - // 응답이 HTML인 경우 (페이지 리다이렉트) - window.location.href = /*[[@{/mypage}]]*/ '/mypage'; + customPopups.showAlert(response.message || '처리 중 오류가 발생했습니다.'); } }, error: function(xhr, status, error) { diff --git a/src/main/resources/templates/views/apps/register/emailValidationResultCorpManager.html b/src/main/resources/templates/views/apps/register/emailValidationResultCorpManager.html index 811c731..c602649 100644 --- a/src/main/resources/templates/views/apps/register/emailValidationResultCorpManager.html +++ b/src/main/resources/templates/views/apps/register/emailValidationResultCorpManager.html @@ -2,7 +2,7 @@ + layout:decorate="~{layout/kjbank_nohead_layout}">
diff --git a/src/main/resources/templates/views/apps/register/emailValidationResultUser.html b/src/main/resources/templates/views/apps/register/emailValidationResultUser.html index 05f75da..3dbec4d 100644 --- a/src/main/resources/templates/views/apps/register/emailValidationResultUser.html +++ b/src/main/resources/templates/views/apps/register/emailValidationResultUser.html @@ -2,7 +2,7 @@ + layout:decorate="~{layout/kjbank_nohead_layout}">
diff --git a/src/main/resources/templates/views/apps/register/joinCompleted.html b/src/main/resources/templates/views/apps/register/joinCompleted.html index 5459d88..8e4ce46 100644 --- a/src/main/resources/templates/views/apps/register/joinCompleted.html +++ b/src/main/resources/templates/views/apps/register/joinCompleted.html @@ -2,7 +2,7 @@ + layout:decorate="~{layout/kjbank_nohead_layout}">