diff --git a/src/main/java/com/eactive/apim/portal/apps/user/dto/PortalOrgRegistrationDTO.java b/src/main/java/com/eactive/apim/portal/apps/user/dto/PortalOrgRegistrationDTO.java index 1181062..c3ebe2d 100644 --- a/src/main/java/com/eactive/apim/portal/apps/user/dto/PortalOrgRegistrationDTO.java +++ b/src/main/java/com/eactive/apim/portal/apps/user/dto/PortalOrgRegistrationDTO.java @@ -30,11 +30,9 @@ public class PortalOrgRegistrationDTO extends PortalUserRegistrationDTO { private String orgName; //대표자 성명 - @NotEmpty(message = "{field.required}") private String ceoName; //기관사업장소재지 - @NotEmpty(message = "{field.required}") private String orgAddr; //기관업태 @@ -44,15 +42,12 @@ public class PortalOrgRegistrationDTO extends PortalUserRegistrationDTO { private String orgIndustryType; //서비스명 - @NotEmpty(message = "{field.required}") private String serviceName; //고객센터연락처 - @NotEmpty(message = "{field.required}") private String scPhoneNumber; //기관전화번호 - @NotEmpty(message = "{field.required}") @PhoneNumber private String orgPhoneNumber; diff --git a/src/main/java/com/eactive/apim/portal/apps/user/service/UserRegistrationValidationService.java b/src/main/java/com/eactive/apim/portal/apps/user/service/UserRegistrationValidationService.java index 30fd379..ad6478b 100644 --- a/src/main/java/com/eactive/apim/portal/apps/user/service/UserRegistrationValidationService.java +++ b/src/main/java/com/eactive/apim/portal/apps/user/service/UserRegistrationValidationService.java @@ -24,17 +24,26 @@ public class UserRegistrationValidationService { } private boolean isValidOrgInfo(PortalOrgRegistrationDTO orgDTO) { - return basicValidationService.isValidBusinessNumber(orgDTO.getCompRegNo()) && - basicValidationService.isValidCorpRegNo(orgDTO.getCorpRegNo()) && - basicValidationService.isValidPhoneNumber(orgDTO.getOrgPhoneNumber()) && - basicValidationService.isValidPhoneNumber(orgDTO.getScPhoneNumber()); + // 사업자등록번호, 법인등록번호는 필수 + if (!basicValidationService.isValidBusinessNumber(orgDTO.getCompRegNo()) || + !basicValidationService.isValidCorpRegNo(orgDTO.getCorpRegNo())) { + return false; + } + // 회사 전화번호, 고객센터 전화번호는 선택 (입력된 경우에만 형식 검증) + if (basicValidationService.isNotEmpty(orgDTO.getOrgPhoneNumber()) && + !basicValidationService.isValidPhoneNumber(orgDTO.getOrgPhoneNumber())) { + return false; + } + if (basicValidationService.isNotEmpty(orgDTO.getScPhoneNumber()) && + !basicValidationService.isValidPhoneNumber(orgDTO.getScPhoneNumber())) { + return false; + } + return true; } private boolean isValidRequiredFields(PortalOrgRegistrationDTO orgDTO) { - return basicValidationService.isNotEmpty(orgDTO.getOrgName()) && - basicValidationService.isNotEmpty(orgDTO.getCeoName()) && - basicValidationService.isNotEmpty(orgDTO.getOrgAddr()) && - basicValidationService.isNotEmpty(orgDTO.getServiceName()); + // 법인명만 필수, 나머지(대표자 성명, 소재지, 서비스명)는 선택 + return basicValidationService.isNotEmpty(orgDTO.getOrgName()); } private boolean isValidIpWhitelistIfExists(PortalOrgRegistrationDTO orgDTO) { diff --git a/src/main/resources/templates/views/apps/register/components/orgBasicInfoForm.html b/src/main/resources/templates/views/apps/register/components/orgBasicInfoForm.html index 46359ec..419527d 100644 --- a/src/main/resources/templates/views/apps/register/components/orgBasicInfoForm.html +++ b/src/main/resources/templates/views/apps/register/components/orgBasicInfoForm.html @@ -60,12 +60,12 @@