From d014cba0ac7268ef3e692ea649567bd6de861b0d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 23 12월 2021 16:28:42 +0900
Subject: [PATCH] 이슈 추가/수정시 워크플로우에 설정된 담당부서로 변경되도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 7 +++----
src/main/webapp/scripts/config.js | 2 +-
src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java | 6 +++---
3 files changed, 7 insertions(+), 8 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 5521106..2485611 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -3817,14 +3817,13 @@
@Override
public void findReadyDepartments(Map<String, Object> resJsonData, DepartmentCondition condition, Pageable pageable) {
- Integer issueStatusId = 1;
- condition.setIssueStatusId(issueStatusId);
-
IssueType issueType = this.issueTypeService.getIssueType(condition.getIssueTypeId());
if (issueType != null) {
+ // �씠�뒋 �긽�깭 �쑀�삎�씠 '��湲�' �씤 �씠�뒋 �긽�깭 媛��졇�삤湲�
+ IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
+ condition.setIssueStatusId(issueStatus.getId());
condition.setWorkflowId(issueType.getWorkflow().getId());
}
-
List<Map<String, Object>> departmentVos = this.departmentMapper.findByIssueStatusId(condition);
resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);
}
diff --git a/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
index c81f030..38b42da 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
@@ -21,7 +21,7 @@
private List<Long> departmentIds = Lists.newArrayList();
private Long issueTypeId;
- private Integer issueStatusId;
+ private Long issueStatusId;
private Long workflowId;
private Integer Page;
@@ -121,11 +121,11 @@
this.issueTypeId = issueTypeId;
}
- public Integer getIssueStatusId() {
+ public Long getIssueStatusId() {
return issueStatusId;
}
- public void setIssueStatusId(Integer issueStatusId) {
+ public void setIssueStatusId(Long issueStatusId) {
this.issueStatusId = issueStatusId;
}
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 60ab2f5..8c0a0f1 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -247,7 +247,7 @@
"USER_PERMISSION_MNG_ISSUE" : 4096,
"USER_PERMISSION_MNG_PARTNER" : 2048,
"USER_PERMISSION_MNG_API" : 1024,
- "USER_PERMISSION_MNG_ISSUE_SYSTEM" : 512,
+ "USER_PERMISSION_MNG_ISSUE_STATUS" : 512,
"USER_PERMISSION_MNG_WORKFLOW" : 256,
"USER_PERMISSION_MNG_CUSTOME_FIELD" : 128,
"USER_PERMISSION_MNG_ISSUE_TYPE" : 64,
--
Gitblit v1.8.0