From fbcad460c73917d721f7008bd724d6eaabf8d089 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 일, 05 12월 2021 14:00:04 +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 | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 6c786e3..e21905a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -157,6 +157,9 @@
private UserWorkspaceService userWorkspaceService;
@Autowired
+ private WorkflowDepartmentService workflowDepartmentService;
+
+ @Autowired
private IssueRelationService issueRelationService;
@Autowired
@@ -199,6 +202,28 @@
if (issueType == null){
throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ISSUE_TYPE_ERROR));
}
+
+ 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());
+ }
+ }
+
// �봽濡쒖젥�듃 �엯�젰
Project project = issueType.getProject();
@@ -341,7 +366,7 @@
// �떞�떦�옄 吏��젙
//this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
// �떞�떦遺��꽌 吏��젙
- this.issueDepartmentService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
// �뾽泥� �젙蹂� ���옣
this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
// ISP �젙蹂� ���옣
--
Gitblit v1.8.0