From 125084f587f86785cda54223848b6ae22310af59 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 14:35:53 +0900
Subject: [PATCH] 업체에서 여러 이메일 추가 시 이슈에서 메일 보낼 때 분리
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 084251d..caf3aa7 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -212,6 +212,9 @@
@Autowired
private IssueRelationMapper issueRelationMapper;
+ @Autowired
+ private WorkflowTransitionService workflowTransitionService;
+
@Override
protected JpaRepository<Issue, Long> getRepository() {
return this.issueRepository;
@@ -262,6 +265,9 @@
}
} else if (issueApiForm.getIssueStatusId() == null){
throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_ISSUE_STATUS_NOT_EXIST));
+ } else if (!this.workflowTransitionService.contains(issueApiForm.getIssueStatusId(), workflow.getId())) {
+ //�씠�뒋 �긽�깭 �쑀�슚�꽦 �솗�씤
+ throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_ISSUE_STATUS_NOT_EXIST_IN_WORKFLOW));
}
// �봽濡쒖젥�듃 �엯�젰
@@ -2799,23 +2805,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