From d5d694bc42eadfe36ae99988ab6ebb22769a32e3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 10 3월 2022 13:10:28 +0900
Subject: [PATCH] - 상위이슈와 그 이슈의 하위이슈를 같이 삭제 할 경우 오류 수정 - 이슈리스트 기본값 '상위이슈만 보기'로 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 058e7b7..de46104 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -459,10 +459,12 @@
// 媛��긽 �긽�쐞 �씠�뒋 異붽�
parentIssueForm.setUseIssueCustomFields(issueApiForm.getUseIssueCustomFieldIds());
// 媛숈� �룄硫붿씤 �뾽泥� 李얘린
- IssueForm partners = this.findCompanyField(parentIssueForm);
- parentIssueForm.setIssueCompanyFields(partners.getIssueCompanyFields());
- parentIssueForm.setIssueIspFields(partners.getIssueIspFields());
- parentIssueForm.setIssueHostingFields(partners.getIssueHostingFields());
+ if (parentIssueForm.getIssueCompanyFields() == null) {
+ IssueForm partners = this.findCompanyField(parentIssueForm);
+ parentIssueForm.setIssueCompanyFields(partners.getIssueCompanyFields());
+ parentIssueForm.setIssueIspFields(partners.getIssueIspFields());
+ parentIssueForm.setIssueHostingFields(partners.getIssueHostingFields());
+ }
Issue issue = addIssue(user, parentIssueForm, null);
issues.add(issue);
@@ -2694,21 +2696,24 @@
this.messageAccessor.getMessage(MsgConstants.ISSUE_REMOVE_NOT_SELECT));
}
- List<Issue> removeIssues = Lists.newArrayList();
+ Set<Long> removeIds = new HashSet<>();
for (Long issueId : issueForm.getRemoveIds()) {
+ removeIds.add(issueId);
//�븯�쐞�씠�뒋 泥댄겕
List<Issue> downIssues = this.issueRepository.findByParentIssueId(issueId);
if(downIssues != null && downIssues.size() > 0){
for(Issue downIssue : downIssues){
Long downIssueId = downIssue.getId();
- downIssue = this.issueRemoves(downIssueId, user);
- removeIssues.add(downIssue);
+ removeIds.add(downIssueId);
}
}
- Issue issue = this.issueRemoves(issueId, user);
- removeIssues.add(issue);
}
+
+ for (Long removeId : removeIds) {
+ this.issueRemoves(removeId, user);
+ }
+
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_REMOVE));
}
--
Gitblit v1.8.0