From d71d945fd2d4d8faa4b293054accb09283432043 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 07 12월 2021 19:43:02 +0900
Subject: [PATCH] 하위 이슈 초기화면 목록 안뜨는 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java
index c35f695..6f556c6 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java
@@ -1,9 +1,11 @@
package kr.wisestone.owl.service.impl;
import com.google.common.collect.Lists;
+import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
import kr.wisestone.owl.domain.enumType.IssueHistoryType;
+import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.IssueCustomFieldValueMapper;
import kr.wisestone.owl.repository.IssueCustomFieldValueRepository;
import kr.wisestone.owl.service.*;
@@ -76,7 +78,12 @@
}
if (issueCustomFieldValues.size() > 0) {
- this.issueCustomFieldValueRepository.saveAll(issueCustomFieldValues);
+ try {
+ this.issueCustomFieldValueRepository.saveAll(issueCustomFieldValues);
+ } catch (Exception ex) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_NOT_EXIST));
+ }
}
}
@@ -295,6 +302,12 @@
switch (CustomFieldType.valueOf(issueCustomFieldValueCondition.getCustomFieldType())) {
case INPUT:
+ case NUMBER:
+ case DATETIME:
+ case IP_ADDRESS:
+ case EMAIL:
+ case SITE:
+ case TEL:
result = this.issueCustomFieldValueMapper.findLikeUseValue(issueCustomFieldValueCondition);
break;
case MULTI_SELECT:
@@ -327,6 +340,29 @@
return customFieldSearch;
}
+ @Override
+ public Map<String, Object> find(IssueCustomFieldValueCondition issueCustomFieldValueCondition) {
+ if (issueCustomFieldValueCondition.getUseValues().size() > 0 || !StringUtils.isEmpty(issueCustomFieldValueCondition.getUseValue())) {
+ issueCustomFieldValueCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� 寃��깋 �떆�옉
+ Map<String, Object> result = new HashMap<>();
+
+ switch (CustomFieldType.valueOf(issueCustomFieldValueCondition.getCustomFieldType())) {
+ case INPUT:
+ result = this.issueCustomFieldValueMapper.findLikeUseValue(issueCustomFieldValueCondition);
+ break;
+ case MULTI_SELECT:
+ case SINGLE_SELECT:
+ result = this.issueCustomFieldValueMapper.findByUseValue(issueCustomFieldValueCondition);
+ break;
+ }
+
+ return result;
+ }
+ return null;
+ }
+
// �씠�뒋�뿉�꽌 ���옣�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪쓣 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
--
Gitblit v1.8.0