From 55480603f392704352492b3ba99cd7198f44cc8a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 08 12월 2021 14:54:15 +0900
Subject: [PATCH] * 업체,ISP,호스팅 - url(도메인) 항목 추가 * 이슈상태가 완료인 이슈는 리스트에서 제외
---
src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..4a8da1d 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 以묐났 肄붾뱶 �젣嫄�
@@ -104,7 +114,9 @@
// �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 �궗�슜�옄�쓽 �씠�뒋 寃��깋 議곌굔�쓣 議고쉶�븳�떎.
IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(issueTypeId, issueTableType);
- if (issueTableConfig != null) {
+ if (issueTableConfig != null && issueTableConfig.getIssueTableType() == 2) {
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
+ } else if (issueTableConfig != null && issueTableConfig.getIssueTableType() == 3) {
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
}
else {
--
Gitblit v1.8.0