From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 34e6886..f8e1f52 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java
@@ -333,6 +333,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