From d438f9c81cffd2e2cbec48150b43a5a89c9ab749 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 16 2월 2022 15:56:56 +0900 Subject: [PATCH] - 하위이슈 직접 생성 시 프로젝트 변경 못하도록 수정 - 연관이슈 직접 생성 시 프로젝트 변경 할 경우 이슈타입도 변경 되도록 수정 --- src/main/java/kr/wisestone/owl/service/impl/IssueRelationServiceImpl.java | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueRelationServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueRelationServiceImpl.java index f16b414..3dc754c 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueRelationServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueRelationServiceImpl.java @@ -94,20 +94,21 @@ @Override @Transactional public boolean removeRelationIssue(Map<String, Object> resJsonData, IssueRelationCondition condition) { - Long id = condition.getId(); - if (id != null) { - IssueRelation issueRelation = findOne(id); - if (issueRelation != null) { - StringBuilder sb = new StringBuilder(); - issueHistoryService.detectRelationIssue(IssueHistoryType.DELETE, issueRelation, sb); - issueHistoryService.addIssueHistory(issueRelation.getIssue(), IssueHistoryType.MODIFY, sb.toString()); + //Long id = condition.getId(); + List<Long> relRemoveIds = condition.getRemoveIds(); + if (relRemoveIds != null && relRemoveIds.size() > 0) { + for (Long relId : relRemoveIds) { + IssueRelation issueRelation = findOne(relId); + if (issueRelation != null) { + StringBuilder sb = new StringBuilder(); + issueHistoryService.detectRelationIssue(IssueHistoryType.DELETE, issueRelation, sb); + issueHistoryService.addIssueHistory(issueRelation.getIssue(), IssueHistoryType.MODIFY, sb.toString()); - this.issueRelationRepository.deleteById(id); - - return true; + this.issueRelationRepository.deleteById(relId); + } } + return true; } - return false; } } -- Gitblit v1.8.0