From 6a8cacfc31f8ac932844a122940fdfd127c117ac Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 09 2월 2022 09:17:20 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 78286d0..249b1c6 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
@@ -194,14 +194,21 @@
@Transactional(readOnly = true)
public List<IssueTypeCustomFieldVo> findCustomFieldByIssueType(Map<String, Object> resJsonData, IssueTypeCustomFieldCondition condition) {
List<IssueTypeCustomFieldVo> issueTypeCustomFieldVos = Lists.newArrayList();
-
- IssueType issueType = this.issueTypeService.getIssueType(condition.getIssueTypeId());
- condition.setIssueTypeId(issueType.getId());
+ List<IssueTypeCustomFieldVo> issueTypeCustomFieldVo = Lists.newArrayList();
condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
- List<IssueTypeCustomFieldVo> issueTypeCustomFieldVo = this.issueTypeCustomFieldMapper.findByIssueType(condition);
+
+ 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;
}
--
Gitblit v1.8.0