From abebb925cfd71d15fbb8d9c940b329cda9eb34e5 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 07 12월 2021 09:34:47 +0900
Subject: [PATCH] 문의하기 버튼 숨김

---
 src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
index 0be3c51..a9ce5db 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -12,6 +12,7 @@
 import kr.wisestone.owl.repository.IssueTypeRepository;
 import kr.wisestone.owl.service.*;
 import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
 import kr.wisestone.owl.vo.*;
 import kr.wisestone.owl.web.condition.IssueTypeCondition;
 import kr.wisestone.owl.web.form.IssueTypeForm;
@@ -173,7 +174,17 @@
         condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
         condition.setPageSize(pageable.getPageSize());
         condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+
         List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
+        for (Map<String, Object> result : results) {
+            Long projectId = MapUtil.getLong(result, "projectId");
+            if (projectId != null) {
+                Project project = this.projectService.getProject(projectId);
+                ProjectVo projectVo = ConvertUtil.copyProperties(project, ProjectVo.class);
+                result.put("projectVo", projectVo);
+            }
+        }
+
         Long totalCount = this.issueTypeMapper.count(condition);
         int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
         List<IssueTypeVo> issueTypeVos = ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
@@ -196,6 +207,15 @@
         return issueTypeVos;
     }
 
+    //  �씠�뒋 �쑀�삎 紐⑸줉�쓣 議고쉶�븳�떎.
+    @Override
+    @Transactional(readOnly = true)
+    public List<IssueTypeVo> findIssueType(IssueTypeCondition condition) {
+        condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+        List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
+        return ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
+    }
+
     //  �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� �뀑�똿�븳�떎.
     private void setUseIssueTypeByWorkflow(List<IssueTypeVo> issueTypeVos) {
         for (IssueTypeVo issueTypeVo : issueTypeVos) {

--
Gitblit v1.8.0