From 571503a6f8d3ef2eb3d6929d4a584644fff7c896 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 15:53:04 +0900
Subject: [PATCH] 이슈 업체 메일 보내기 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index a242bab..9ff385d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1527,7 +1527,7 @@
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
this.setIssueDetail(issueVo, issue, user); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
- this.setIssueTableConfigs(issue, issueVo);
+ this.setIssueTableConfigs(issue, issueVo, issueCondition);
issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
break;
}
@@ -1539,8 +1539,9 @@
}
// �뀒�씠釉� �꽕�젙 �뀑�똿
- private void setIssueTableConfigs(Issue issue, IssueVo issueVo) {
- Long IssueTypeId = issue.getIssueType().getId();
+ private void setIssueTableConfigs(Issue issue, IssueVo issueVo, IssueCondition issueCondition) {
+ //Long IssueTypeId = issue.getIssueType().getId();
+ Long IssueTypeId = issueCondition.getIssueTypeId();
for (int tableConfigType : IssueTableConfig.IssueTableTypes) {
if (tableConfigType != IssueTableConfig.ISSUE_TABLE_TYPE_MAIN) {
@@ -1839,6 +1840,7 @@
issueCustomFieldValueCondition.setUseValue(concatUseValue);
issueCustomFieldValueCondition.setUseValues(userValues);
issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
+ issueCustomFieldValueCondition.setIssueStatusType("CLOSE");
List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
if (results != null && results.size() > 0) {
for (Map<String, Object> result : results) {
@@ -2804,23 +2806,23 @@
CompanyField companyField = issueCompany.getCompanyField();
if (companyField != null) {
issueCompanyVo.setCompanyId(issueCompany.getCompanyField().getId());
- if (issueCompany.getCompanyTypeId() != null) {
+ if (issueCompany.getCompanyTypeId() != null && issueCompany.getCompanyTypeId() != -1) {
CompanyFieldCategory companyType = this.companyFieldCategoryService.find(issueCompany.getCompanyTypeId());
issueCompanyVo.setCompanyTypeName(companyType.getUseValue());
}
- if (issueCompany.getParentSectorId() != null) {
+ if (issueCompany.getParentSectorId() != null && issueCompany.getParentSectorId() != -1) {
CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(issueCompany.getParentSectorId());
issueCompanyVo.setParentSectorName(parentSector.getUseValue());
}
- if (issueCompany.getChildSectorId() != null) {
+ if (issueCompany.getChildSectorId() != null && issueCompany.getChildSectorId() != -1) {
CompanyFieldCategory childSector = this.companyFieldCategoryService.find(issueCompany.getChildSectorId());
issueCompanyVo.setChildSectorName(childSector.getUseValue());
}
- if (issueCompany.getRegionId() != null) {
+ if (issueCompany.getRegionId() != null && issueCompany.getRegionId() != -1) {
CompanyFieldCategory region = this.companyFieldCategoryService.find(issueCompany.getRegionId());
issueCompanyVo.setRegionName(region.getUseValue());
}
- if (issueCompany.getStatusId() != null) {
+ if (issueCompany.getStatusId() != null && issueCompany.getStatusId() != -1) {
CompanyFieldCategory status = this.companyFieldCategoryService.find(issueCompany.getStatusId());
issueCompanyVo.setStatusName(status.getUseValue());
}
--
Gitblit v1.8.0