From 2473c035d63bc0f27b329eba7dccda33e5837d62 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 15:11:44 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..789b9d4 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
@@ -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