From 261950c3d8e20fb94141c03b37a2872f75477831 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 21:07:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index 01602a2..a5a4271 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -85,12 +85,19 @@
this.verifyUrl(companyFieldForm.getUrl(), null);
if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
- String[] tels = ConvertUtil.ToArray(companyFieldForm.getTelList());
- companyFieldForm.setTel(Arrays.toString(tels));
+ String tels = companyFieldForm.getTelList().toString();
+ if (tels.contains("[")) {
+ tels = tels.substring(1, tels.indexOf("]"));
+ }
+ companyFieldForm.setTel(tels.trim());
}
if (companyFieldForm.getEmailList() != null && companyFieldForm.getEmailList().size() > 0) {
- String[] emails = ConvertUtil.ToArray(companyFieldForm.getEmailList());
- companyFieldForm.setEmail(Arrays.toString(emails));
+ String emails = companyFieldForm.getEmailList().toString();
+ String email = "";
+ if (emails.contains("[")) {
+ email = emails.substring(1, emails.indexOf("]"));
+ }
+ companyFieldForm.setEmail(email.trim());
}
CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
@@ -203,12 +210,24 @@
this.verifyUrl(companyFieldForm.getUrl(), companyFieldForm.getId());
if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
- String[] tels = ConvertUtil.ToArray(companyFieldForm.getTelList());
- companyFieldForm.setTel(Arrays.toString(tels));
+ String tels = companyFieldForm.getTelList().toString();
+ if (tels.contains("[")) {
+ tels = tels.substring(1, tels.indexOf("]"));
+ }
+ companyFieldForm.setTel(tels.trim());
}
if (companyFieldForm.getEmailList() != null && companyFieldForm.getEmailList().size() > 0) {
- String[] emails = ConvertUtil.ToArray(companyFieldForm.getEmailList());
- companyFieldForm.setEmail(Arrays.toString(emails));
+ String emails = companyFieldForm.getEmailList().toString();
+ if (emails.contains("[")) {
+ emails = emails.substring(1, emails.indexOf("]"));
+ }
+ companyFieldForm.setEmail(emails.trim());
+ }
+
+ CompanyFieldCategory companyFieldCategory = this.companyFieldCategoryService.find(companyFieldForm.getChildSectorId());
+ if (!companyFieldCategory.getParentId().equals(companyFieldForm.getParentSectorId())) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.PARENT_SECTOR_NOT_EQUAL));
}
CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
--
Gitblit v1.8.0