From f8d35ef0bfc812494f7d30dff1d075a3327209f1 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 18:30:04 +0900
Subject: [PATCH] - 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 수정 폼에도 적용 - 입력 폼에서 탭키 안먹는 현상 수정
---
src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
index 073e233..501e770 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
@@ -84,11 +84,17 @@
}
IspField ispField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
+
if (ispField.getCode() != null && !ispField.getCode().equals("")) {
- ispFieldRepository.saveAndFlush(ispField);
+ try {
+ ispFieldRepository.saveAndFlush(ispField);
+ } catch (Exception e) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.ISP_CODE_USED_EXIST_VALUE));
+ }
} else {
throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.ISP_CODE_NOT_ENTER));
}
+
return ispField;
}
@@ -143,8 +149,18 @@
IspFieldForm.setEmail(emails.trim());
}
- IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
- ispFieldRepository.saveAndFlush(IspField);
+ IspField ispField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
+
+ if (ispField.getCode() != null && !ispField.getCode().equals("")) {
+ try {
+ ispFieldRepository.saveAndFlush(ispField);
+ } catch (Exception e) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.ISP_CODE_USED_EXIST_VALUE));
+ }
+ } else {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.ISP_CODE_NOT_ENTER));
+ }
+
}
@@ -310,7 +326,15 @@
IspField ispField = new IspField();
ConvertUtil.copyProperties(saveIspFieldForm, ispField);
- ispField = this.ispFieldRepository.saveAndFlush(ispField);
+ if (ispField.getCode() != null && !ispField.getCode().equals("")) {
+ try {
+ ispField = ispFieldRepository.saveAndFlush(ispField);
+ } catch (Exception e) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.ISP_CODE_USED_EXIST_VALUE));
+ }
+ } else {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.ISP_CODE_NOT_ENTER));
+ }
saveIspFieldForm.setId(ispField.getId());
}
--
Gitblit v1.8.0