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/IssueTypeCustomFieldServiceImpl.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
index 8c4dc82..249b1c6 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
@@ -3,6 +3,7 @@
import com.google.common.collect.Lists;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.domain.*;
+import kr.wisestone.owl.mapper.IssueTypeCustomFieldMapper;
import kr.wisestone.owl.repository.IssueTypeCustomFieldRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.ConvertUtil;
@@ -30,10 +31,16 @@
private IssueTypeCustomFieldRepository issueTypeCustomFieldRepository;
@Autowired
+ private IssueTypeCustomFieldMapper issueTypeCustomFieldMapper;
+
+ @Autowired
private ProjectService projectService;
@Autowired
private IssueTypeService issueTypeService;
+
+ @Autowired
+ private UserService userService;
@Autowired
private CustomFieldService customFieldService;
@@ -183,6 +190,29 @@
return issueTypeCustomFieldVos;
}
+ @Override
+ @Transactional(readOnly = true)
+ public List<IssueTypeCustomFieldVo> findCustomFieldByIssueType(Map<String, Object> resJsonData, IssueTypeCustomFieldCondition condition) {
+ List<IssueTypeCustomFieldVo> issueTypeCustomFieldVos = Lists.newArrayList();
+ List<IssueTypeCustomFieldVo> issueTypeCustomFieldVo = Lists.newArrayList();
+ condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+
+ if (condition.getIssueTypeId() != null) {
+ IssueType issueType = this.issueTypeService.getIssueType(condition.getIssueTypeId());
+ condition.setIssueTypeId(issueType.getId());
+ issueTypeCustomFieldVo = this.issueTypeCustomFieldMapper.findByIssueType(condition);
+ } else {
+ issueTypeCustomFieldVo = this.issueTypeCustomFieldMapper.findByWorkspaceId(condition);
+ }
+
+ if (issueTypeCustomFieldVo != null && issueTypeCustomFieldVo.size() > 0) {
+ issueTypeCustomFieldVos.addAll(issueTypeCustomFieldVo);
+ }
+
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeCustomFieldVos);
+ return issueTypeCustomFieldVos;
+ }
+
// �씠�뒋 excel template download �뿉�꽌 �궗�슜
@Override
@Transactional(readOnly = true)
--
Gitblit v1.8.0