From e335c1e8a1417dff563fe3e5254fbc351bcc9e0f Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 24 12월 2021 13:16:13 +0900
Subject: [PATCH] - api 수정시 issue 못찾는 문제 수정 - api 수정시 타이틀 오류 문제 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..f059be1 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1756,6 +1756,9 @@
String comma = ",";
if (issueCustomFieldValueForms.size() > 0) {
+ IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
+ Collections.sort(issueCustomFieldValueForms, comp);
+
String concatUseValue = "";
for (int i = 0; i < issueCustomFieldValueForms.size(); i++) {
IssueCustomFieldValueForm issueCustomFieldValueForm = issueCustomFieldValueForms.get(i);
@@ -1802,6 +1805,7 @@
List<Issue> issues = Lists.newArrayList();
for (Issue issueVo : issue) {
issueForm.setId(issueVo.getId());
+ issueForm.setTitle(issueVo.getTitle());
// �옄�룞 醫낅즺 �긽�깭 �꽕�젙�씠 �릺�뼱 �엳吏� �븡�쑝硫� �삤瑜섎컻�깮
Issue modifyIssue = this.modifyIssueForApi(user, issueForm, files);
@@ -3817,14 +3821,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);
}
--
Gitblit v1.8.0