From d438f9c81cffd2e2cbec48150b43a5a89c9ab749 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 16 2월 2022 15:56:56 +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