From 43e894fc3c8d5c9b80883985a125705a59aaf00e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 17:01:35 +0900
Subject: [PATCH] - 사용자정의필드 '필수데이터' UI 변경 - 이슈 목록에서 컬럼명 마우스 오버시 툴팁 나오도록 수정(tableConfig에 툴팁 설정)
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 96d90c3..af302ce 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1246,7 +1246,7 @@
}
// �봽濡쒖젥�듃瑜� �꽑�깮�븯吏� �븡�븯�쑝硫� �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 李몄뿬�븯怨� �엳�뒗 �봽濡쒖젥�듃瑜� 李얜뒗�떎.
- if (condition.getProjectIds().size() < 1) {
+ /*if (condition.getProjectIds().size() < 1) {
List<Map<String, Object>> projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectStatues, condition.getProjectType());
List<Long> projectIds = Lists.newArrayList();
@@ -1263,7 +1263,7 @@
if (projectIds.size() < 1) {
return false;
}
- }
+ }*/
return true;
}
@@ -3797,4 +3797,18 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
}
}
+
+ @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) {
+ condition.setWorkflowId(issueType.getWorkflow().getId());
+ }
+
+ List<Map<String, Object>> departmentVos = this.departmentMapper.findByIssueStatusId(condition);
+ resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0