From 32da09658f152b739b83565c3e27756d3e92574e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 19:44:22 +0900
Subject: [PATCH] 등록자 OWL 마크 표시 -> 진흥원 마크로 변경 (공지사항, FAQ, QnA, 가이드)
---
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
index 16c21d2..27fb86f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -389,6 +389,7 @@
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
// �봽濡쒖젥�듃 議고쉶 寃곌낵瑜� ProjectVos 濡� 蹂��솚�븳�떎. - 愿�由ъ옄, �씪諛� �궗�슜�옄 �젙蹂� 異붽�
List<ProjectVo> projectVos = this.makeProjectVos(results, user);
+ this.setParentProject(projectVos);
this.setChildrenProject(projectVos, user);
resJsonData.put(Constants.RES_KEY_CONTENTS, projectVos);
@@ -449,6 +450,20 @@
}
return projectVos;
+ }
+
+ // �긽�쐞 �봽濡쒖젥�듃瑜� 李얠븘以��떎.
+ private void setParentProject(List<ProjectVo> projectVos) {
+ for (ProjectVo projectVo : projectVos) {
+ ProjectClosure projectClosure = this.projectClosureRepository.findByProjectId(projectVo.getId());
+ if (projectClosure != null) {
+ Project parentProject = this.getProject(projectClosure.getParentProject().getId());
+ ProjectVo parentProjectVo = ConvertUtil.copyProperties(parentProject, ProjectVo.class);
+ parentProjectVo.setParentYn(true);
+ ConvertUtil.copyProperties(parentProjectVo, projectVo);
+ this.setProjectDepartment(projectVo);
+ }
+ }
}
// 愿�由ъ옄, �씪諛� �궗�슜�옄瑜� 議곌굔�뿉 �뵲�씪 李얠븘以��떎.
@@ -1293,4 +1308,4 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, ConvertUtil.copyProperties(project, ProjectVo.class));
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0