From 24fa2d1e6138c3ad6c4db2790ee98edcc42b459c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 10:52:34 +0900
Subject: [PATCH] - 이슈 목록 하위이슈 숨기기 버튼 생성 - 이슈 Tree 목록 중복 이슈 필터링
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 ddedab6..fcb0a1e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -802,6 +802,7 @@
if (issueCondition.getTree()) {
this.setDownIssues(user, issueVos);
this.setRelationIssues(issueVos);
+ this.setParentIssue(issueVos);
}
this.setCountDownIssues(issueVos);
@@ -829,9 +830,9 @@
IssueVo addIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
addIssueVo.setIssueTypeId(downIssue.getIssueType().getId());
downIssueVos.add(addIssueVo);
-
}
issueVo.setIssueDownVos(downIssueVos);
+
if (downIssueVos.size() > 0) {
this.setDownIssues(user, downIssueVos);
}
@@ -841,11 +842,12 @@
this.setIssueDepartmentList(issueVos, issueCondition, user);
// �벑濡앹옄 �젙蹂� 異붽�
this.setRegister(issueVos); // �떞�떦�옄 �젙蹂� �뀑�똿
-
// �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂� 異붽�
this.setIssueCustomFieldValue(issueVos, issueCondition);
-
- this.SetWorkflowDepartment(issueVos); //�썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 媛��졇�삤湲�
+ //�썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 媛��졇�삤湲�
+ this.SetWorkflowDepartment(issueVos);
+ // �긽�쐞 �씠�뒋 泥댄겕
+ this.setParentIssue(issueVos);
}
}
@@ -859,6 +861,17 @@
}
}
+ // �긽�쐞 �씠�뒋 泥댄겕
+ private void setParentIssue(List<IssueVo> issueVos) {
+ 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);
+ }
+ }
+ }
+
@Override
@Transactional(readOnly = true)
public void setCountDownIssues(List<IssueVo> issueVos) {
--
Gitblit v1.8.0