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/WorkflowServiceImpl.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/WorkflowServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WorkflowServiceImpl.java
index be7a902..c69f4f1 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WorkflowServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WorkflowServiceImpl.java
@@ -200,9 +200,7 @@
for (WorkflowVo workflowVo : workflowVos) {
Workflow workflow = this.getWorkflow(workflowVo.getId());
- WorkflowDepartmentCondition condition = new WorkflowDepartmentCondition();
- condition.setWorkflowId(workflow.getId());
- List<WorkflowDepartmentVo> workflowDepartmentVos = this.workflowDepartmentService.find(condition);
+ List<WorkflowDepartmentVo> workflowDepartmentVos = this.workflowDepartmentService.find(workflow.getId(), null);
if (workflowDepartmentVos != null && workflowDepartmentVos.size() > 0) {
IssueStatusVo issueStatusVo = new IssueStatusVo();
issueStatusVo.setWorkflowDepartmentVos(workflowDepartmentVos);
@@ -225,10 +223,7 @@
case "01" : // �뿰愿��맂 �씠�뒋 �긽�깭�� �쟾�씠�꽑 �젙蹂대�� 媛��졇�삩�떎.
List<IssueStatusVo> issueStatusVos = this.issueStatusService.findByWorkflowId(workflowCondition.getId());
for (IssueStatusVo issueStatusVo : issueStatusVos) {
- WorkflowDepartmentCondition condition = new WorkflowDepartmentCondition();
- condition.setWorkflowId(workflowVo.getId());
- condition.setIssueStatusId(issueStatusVo.getId());
- List<WorkflowDepartmentVo> workflowDepartmentVos = this.workflowDepartmentService.find(condition);
+ List<WorkflowDepartmentVo> workflowDepartmentVos = this.workflowDepartmentService.find(workflowVo.getId(), issueStatusVo.getId());
issueStatusVo.setWorkflowDepartmentVos(workflowDepartmentVos);
}
workflowVo.setIssueStatusVos(issueStatusVos);
--
Gitblit v1.8.0