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/IssueIspServiceImpl.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
index 4bf324b..eeaecba 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -1,7 +1,9 @@
package kr.wisestone.owl.service.impl;
+import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.IssueHistoryType;
+import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.IssueIspMapper;
import kr.wisestone.owl.repository.IssueIspRepository;
import kr.wisestone.owl.service.*;
@@ -50,6 +52,9 @@
* @param issue Issue
*/
private void CreateIspField(IssueForm issueForm, Issue issue, StringBuilder sb) {
+ //肄붾뱶 �쑀�슚�꽦 泥댄겕
+ this.verifyCode(issueForm);
+
// issueIsp �븘�뱶 �뤌 留뚮뱾湲�
IspFieldForm ispFieldForm = new IspFieldForm();
ispFieldForm.setName(issueForm.getIspName());
@@ -86,7 +91,7 @@
* @return IssueIsp
*/
private IssueIsp CreateIssueIsp(IspFieldForm ispFieldForm, Issue issue) {
- IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class);
+ IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class, "id");
issueIsp.setIssue(issue);
if (ispFieldForm.getId() != null && ispFieldForm.getId() != -1) {
IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
@@ -109,6 +114,31 @@
return CreateIssueIsp(ispFieldForm, issue);
}
+ /**
+ * 肄붾뱶 �쑀�슚�꽦 寃��궗
+ * @param param Map<String, Object>
+ */
+ private void verifyCode(Map<String, Object> param) {
+ if (param != null) {
+ if (MapUtil.getString(param, "code") == null || Objects.equals(MapUtil.getString(param, "code"), "")) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISP_CODE_NOT_ENTER));
+ }
+ }
+ }
+
+ /**
+ * 肄붾뱶 �쑀�슚�꽦 寃��궗
+ * @param issueForm IssueForm
+ */
+ private void verifyCode(IssueForm issueForm) {
+ if (issueForm != null) {
+ if (issueForm.getIspCode() == null || issueForm.getIspCode().equals("")) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISP_CODE_NOT_ENTER));
+ }
+ }
+ }
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@@ -121,6 +151,8 @@
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
+ this.verifyCode(param); //肄붾뱶 �쑀�슚�꽦 泥댄겕
+
if (issueIsp != null) {//�닔�젙 �떆
// 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
--
Gitblit v1.8.0