|
@@ -316,7 +316,12 @@ public class WebsitContractSignLogic {
|
|
|
params.set(field.getFieldName(), Optional.ofNullable(websit.getEmail()).orElse(""));
|
|
|
|
|
|
} else if (field.getFieldType().equals(FieldTypeEnum.Y_ADDRESS.getKey())) {
|
|
|
- params.set(field.getFieldName(), Optional.ofNullable(websit.getAddress()).orElse(""));
|
|
|
+ String address = Optional.ofNullable(websit.getAddress()).orElse("");
|
|
|
+ String execAddress = address;
|
|
|
+ if (address.length() > 14) {
|
|
|
+ execAddress = address.substring(0, 14) + "\n" + address.substring(14, address.length() - 1);
|
|
|
+ }
|
|
|
+ params.set(field.getFieldName(), execAddress);
|
|
|
|
|
|
} else if (field.getFieldType().equals(FieldTypeEnum.Y_TEL.getKey())) {
|
|
|
params.set(field.getFieldName(), Optional.ofNullable(websit.getWebsitPhone()).orElse(""));
|
|
@@ -343,13 +348,18 @@ public class WebsitContractSignLogic {
|
|
|
params.set(field.getFieldName(), companyCaAuth.getShortName());
|
|
|
|
|
|
} else if (field.getFieldType().equals(FieldTypeEnum.ADDRESS.getKey())) {
|
|
|
- params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getAddress()).orElse(""));
|
|
|
+ String address = Optional.ofNullable(companyCaAuth.getCompanyAddress()).orElse("");
|
|
|
+ String execAddress = address;
|
|
|
+ if (address.length() > 14) {
|
|
|
+ execAddress = address.substring(0, 14) + "\n" + address.substring(14, address.length() - 1);
|
|
|
+ }
|
|
|
+ params.set(field.getFieldName(), execAddress);
|
|
|
|
|
|
} else if (field.getFieldType().equals(FieldTypeEnum.TEL.getKey())) {
|
|
|
params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getLinkMobile()).orElse(""));
|
|
|
|
|
|
} else if (field.getFieldType().equals(FieldTypeEnum.FAX.getKey())) {
|
|
|
- params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getLegalMobile()).orElse(""));
|
|
|
+ params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getFax()).orElse(""));
|
|
|
|
|
|
} else if (field.getFieldType().equals(FieldTypeEnum.ZIP_CODE.getKey())) {
|
|
|
params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getZipCode()).orElse(""));
|