From 72cbca5a2e1263ad691bc7b3c0080691640309ab Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 11:18:01 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 2b0f5e9..5d2b1f4 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -828,6 +828,7 @@
private void setDownIssues(Issue issue, IssueVo issueVo) {
List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId());
List<IssueVo> downIssueVos = ConvertUtil.convertObjectsToClasses(downIssues, IssueVo.class);
+ List<IssueVo> resultList = new ArrayList<>();
for(IssueVo downIssueVo : downIssueVos){
for(Issue downIssue : downIssues){
@@ -837,9 +838,11 @@
downIssueVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class));
this.setRegister(downIssue, downIssueVo); // �벑濡앹옄
this.setIssueDepartment(downIssue, downIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ this.setIssueCustomFields(downIssue, downIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
}
- issueVo.setIssueDownVos(downIssueVo);
+ resultList.add(downIssueVo);
}
+ issueVo.setIssueDownVos(resultList); //�봽濡좏듃�뿉�꽌 List�삎�깭濡� 諛쏆븘以섏꽌 由ъ뒪�듃 �삎�떇�쑝濡� 蹂대궡以�
}
// �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
@@ -917,6 +920,7 @@
issueRelationVo.setSeverityVo(ConvertUtil.copyProperties(relationIssue.getSeverity(), SeverityVo.class));
this.setRegister(relationIssue, relIssueVo); // �벑濡앹옄
this.setIssueDepartment(relationIssue, relIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ this.setIssueCustomFields(relationIssue, relIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
issueVo.addIssueRelationVo(issueRelationVo);
}
} else {
--
Gitblit v1.8.0