From 0509eeb6d6417f20aabe54295512384be707ff9d Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 금, 26 11월 2021 18:26:11 +0900 Subject: [PATCH] 테이블 표시 설정 기능 확장 [프론트] --- src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java | 14 ++++++++++++-- 1 files changed, 12 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 309e688..ce863bf 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; import java.util.Map; @Service @@ -88,15 +89,24 @@ @Override @Transactional(readOnly = true) public IssueTableConfig findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(Long issueTypeId, int issueTableType) { - return this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(this.webAppUtil.getLoginId(), + List<IssueTableConfig> issueTableConfigList = this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(this.webAppUtil.getLoginId(), this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueTypeId, issueTableType); + + if (issueTableConfigList != null && issueTableConfigList.size() > 0) { + return issueTableConfigList.get(0); + } + return null; } //�씠�뒋���엯 Id�� IssueTableType 議고쉶 @Override @Transactional(readOnly = true) public IssueTableConfig findByIssueTypeIdAndIssueTableType(Long issueTypeId, int issueTableType) { - return this.issueTableConfigRepository.findByIssueTypeIdAndIssueTableType(issueTypeId, issueTableType); + List<IssueTableConfig> issueTableConfigs = this.issueTableConfigRepository.findByIssueTypeIdAndIssueTableType(issueTypeId, issueTableType); + if (issueTableConfigs != null && issueTableConfigs.size() > 0){ + return issueTableConfigs.get(0); + } + return null; } // detail 以묐났 肄붾뱶 �젣嫄� -- Gitblit v1.8.0