From 9bd144be7f96e418f82bffb6a119aaaebc8c3106 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 14:27:21 +0900
Subject: [PATCH] 기본 프로젝트 삭제 가능(체크박스 defaultYN에 대한 조건 주석처리)
---
src/main/java/kr/wisestone/owl/service/impl/IssueRelationServiceImpl.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 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 c613a5d..f16b414 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueRelationServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueRelationServiceImpl.java
@@ -65,24 +65,16 @@
// �뿰愿� �씪媛� 媛��졇�삤湲�
@Override
public List<IssueVo> findRelationIssue(Map<String, Object> resJsonData, IssueRelationCondition condition, Pageable pageable) {
- List<IssueRelation> issueRelations = issueRelationRepository.findAllByIssueId(condition.getIssueId());
- List<IssueVo> issueVos = new ArrayList<>();
+ List<IssueVo> issueVos = findRelationIssue(condition.getIssueId());
- if (issueRelations != null) {
- for (IssueRelation issueRelation : issueRelations) {
- issueVos.add(ConvertUtil.copyProperties(issueRelation.getRelationIssue(), IssueVo.class));
- }
-
- int totalCount = issueVos.size();
-
- resJsonData.put(Constants.RES_KEY_CONTENTS, issueVos);
- resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
- 1, totalCount));
- }
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issueVos);
+ resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
+ 1, issueVos.size()));
return issueVos;
}
+
// �뿰愿� �씪媛� 媛��졇�삤湲�
@Override
public List<IssueVo> findRelationIssue(Long issueId) {
--
Gitblit v1.8.0