From 1cc04f2168129f691eb017153b11b08ab83d9cbd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 15:43:28 +0900
Subject: [PATCH] 이슈 Tree 목록 중복 이슈 필터링 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index c887234..8fa627b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -802,9 +802,9 @@
this.setMapToIssueVo(results, issueVos, issueCondition, user);
if (issueCondition.getTree()) {
+ this.setParentIssue(issueVos);
this.setDownIssues(user, issueVos);
this.setRelationIssues(issueVos);
- this.setParentIssue(issueVos);
}
this.setCountDownIssues(issueVos);
@@ -848,8 +848,6 @@
this.setIssueCustomFieldValue(issueVos, issueCondition);
//�썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 媛��졇�삤湲�
this.SetWorkflowDepartment(issueVos);
- // �긽�쐞 �씠�뒋 泥댄겕
- this.setParentIssue(issueVos);
}
}
@@ -868,8 +866,11 @@
for(IssueVo issueVo : issueVos) {
if(issueVo.getParentIssueId() != null) {
Issue parentIssue = this.getIssue(issueVo.getParentIssueId());
- issueVo.setParentIssueVo(ConvertUtil.copyProperties(parentIssue, IssueVo.class));
- ConvertUtil.copyProperties(issueVo.getParentIssueVo(), issueVo);
+ //issueVo.setParentIssueVo(ConvertUtil.copyProperties(parentIssue, IssueVo.class));
+ if(parentIssue.getIssueCustomFieldValues() == null || parentIssue.getIssueCustomFieldValues().size() == 0){
+ issueVo.setIssueCustomFieldValueVos(null);
+ }
+ ConvertUtil.copyProperties(parentIssue, issueVo);
}
}
}
--
Gitblit v1.8.0