From 385f0d9070b90d2253ddaeaf1b2e2491ebaeda95 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 토, 11 12월 2021 21:34:18 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 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 d3c4f10..142f491 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -211,23 +211,16 @@
Workflow workflow = issueType.getWorkflow();
- // �씠�뒋 �긽�깭媛� 吏��젙�릺�뼱 �엳吏� �븡�쓣 寃쎌슦 珥덇린媛믪쑝濡� 吏��젙
- if (issueApiForm.getIssueStatusId() == null) {
- List<IssueStatusVo> issueStatusVos = issueStatusService.findByWorkflowId(workflow.getId());
- IssueStatusVo issueStatusVo = issueStatusVos.get(0);
- issueApiForm.setIssueStatusId(issueStatusVo.getId());
- }
-
- // �썙�겕�뵆濡쒖슦 �긽�깭�뿉 �뵲瑜� �떞�떦遺��꽌 媛��졇�삤湲�
- if (issueApiForm.getIssueStatusId() != null) {
- WorkflowDepartmentCondition workflowDepartmentCondition = new WorkflowDepartmentCondition();
- workflowDepartmentCondition.setIssueStatusId(issueApiForm.getIssueStatusId());
- workflowDepartmentCondition.setWorkflowId(workflow.getId());
- List<WorkflowDepartmentVo> workflowDepartmentVos = this.workflowDepartmentService.find(workflowDepartmentCondition);
-
- for (WorkflowDepartmentVo workflowDepartmentVo : workflowDepartmentVos) {
- issueForm.addDepartmentId(workflowDepartmentVo.getDepartmentVo().getId());
+ if (issueApiForm.getApiType().equals(IssueApiForm.ApiType.add)) {
+ // �씠�뒋 �긽�깭媛� 吏��젙�릺�뼱 �엳吏� �븡�쓣 寃쎌슦 �썙�겕�뵆濡쒖슦 ��湲� �긽�깭 媛믪쑝濡� 吏��젙
+ List<Long> departmentIds = this.workflowDepartmentService.findFirstDepartmentIds(workflow);
+ if (departmentIds != null && departmentIds.size() > 0) {
+ for (Long departmentId : departmentIds) {
+ issueForm.addDepartmentId(departmentId);
+ }
}
+ } else if (issueApiForm.getIssueStatusId() == null){
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_ISSUE_STATUS_NOT_EXIST));
}
// �봽濡쒖젥�듃 �엯�젰
--
Gitblit v1.8.0