From 909a0f1be2fddf26e9639dd189e3e7261040ac12 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 07 1월 2022 16:56:07 +0900
Subject: [PATCH] 전체 이슈 목록 메뉴 추가

---
 src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java
index dcdbf65..7fe16d8 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java
@@ -90,8 +90,14 @@
     @Override
     @Transactional(readOnly = true)
     public IssueTableConfig findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(Long issueTypeId, int issueTableType) {
-        List<IssueTableConfig> issueTableConfigList = this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(this.webAppUtil.getLoginId(),
-                this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueTypeId, issueTableType);
+        List<IssueTableConfig> issueTableConfigList = null;
+        if (issueTypeId != null) {
+            issueTableConfigList = this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(this.webAppUtil.getLoginId(),
+                    this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueTypeId, issueTableType);
+        } else {
+            issueTableConfigList = this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueTableType(this.webAppUtil.getLoginId(),
+                    this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueTableType);
+        }
 
         if (issueTableConfigList != null && issueTableConfigList.size() > 0) {
             return  issueTableConfigList.get(0);

--
Gitblit v1.8.0