From 4d692a614bba9d8954cbbdad2d79424afaab0298 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 03 1월 2022 17:50:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
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