From 65cd4c4e16972a7a0cc638c866d758c42fad37e1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 21:13:03 +0900
Subject: [PATCH] 이슈 추가 오류 해결
---
src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java
index 0b36fc8..b25d5e8 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java
@@ -45,6 +45,9 @@
private WorkflowTransitionService workflowTransitionService;
@Autowired
+ private WorkflowDepartmentService workflowDepartmentService;
+
+ @Autowired
private IssueTypeService issueTypeService;
@Autowired
@@ -320,11 +323,11 @@
// �궘�젣�븷 �씠�뒋 �긽�깭媛� �썙�겕�뵆濡쒖슦 �뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �솗�씤�븳�떎.
this.checkUseWorkflow(issueStatus);
- // 湲곕낯�쑝濡� �젣怨듬릺�뒗 �씠�뒋 �긽�깭�뒗 �궘�젣 湲덉�
- if (issueStatus.getDefaultYn()) {
+ // 湲곕낯�쑝濡� �젣怨듬릺�뒗 �씠�뒋 �긽�깭�뒗 �궘�젣 湲덉� -> 湲곕낯�젣怨듭씠�뿬�룄 �궗�슜�븯吏� �븡�쑝硫� �궘�젣 媛��뒫�븯�룄濡� �닔�젙
+ /*if (issueStatus.getDefaultYn()) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.DEFAULT_ISSUE_STATUS_NOT_REMOVE));
- }
+ }*/
this.issueStatusRepository.delete(issueStatus);
}
@@ -545,12 +548,18 @@
if (count < 1) {
IssueStatusVo issueStatusVo = new IssueStatusVo(workflowTransitionVo.getTargetStatusId(), workflowTransitionVo.getTargetStatusName());
issueStatusVos.add(issueStatusVo);
+
+ List<WorkflowDepartmentVo> workflowDepartments = this.workflowDepartmentService.find(workflow.getId(), issueStatusVo.getId());
+ issueStatusVo.setWorkflowDepartmentVos(workflowDepartments);
}
else {
// �몢踰덉㎏ �씠�뒋遺��꽣 泥ル쾲吏� �씠�뒋�뿉�꽌 �씠�룞 媛��뒫�뻽�뜕 �긽�깭 以� �뾾�뒗 ���긽�쓣 李얜뒗�떎.
for (IssueStatusVo issueStatusVo : issueStatusVos) {
if (issueStatusVo.getId().equals(workflowTransitionVo.getTargetStatusId())) {
tempIssueStatusVos.add(issueStatusVo);
+
+ List<WorkflowDepartmentVo> workflowDepartments = this.workflowDepartmentService.find(workflow.getId(), issueStatusVo.getId());
+ issueStatusVo.setWorkflowDepartmentVos(workflowDepartments);
}
}
}
@@ -566,5 +575,4 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, issueStatusVos);
}
-
}
--
Gitblit v1.8.0