From f8d35ef0bfc812494f7d30dff1d075a3327209f1 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 18:30:04 +0900
Subject: [PATCH] - 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 수정 폼에도 적용 - 입력 폼에서 탭키 안먹는 현상 수정
---
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
index d628a37..aaef9a8 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -60,6 +60,9 @@
private WorkflowStatusService workflowStatusService;
@Autowired
+ private WorkflowDepartmentService workflowDepartmentService;
+
+ @Autowired
private WorkspaceService workspaceService;
@Autowired
@@ -399,6 +402,13 @@
totalPage, totalCount));
return projectVos;
+ }
+
+ // �씠�뒋�쑀�삎�뿉 �냽�븳 �봽濡쒖젥�듃 紐⑸줉�쓣 議고쉶�븳�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public void findIssueType(Map<String, Object> resJsonData, ProjectCondition condition) {
+ resJsonData.put(Constants.RES_KEY_CONTENTS, this.projectMapper.findByIssueType(condition));
}
void setChildrenProject(List<ProjectVo> projectVos, User user) {
@@ -812,8 +822,11 @@
}
projectRole.getProjectRoleDepartments().clear();
+ this.checkDepartmentOfWorkflow(project, projectForm.getDepartmentIds());
+
for (Long departmentId : projectForm.getDepartmentIds()) {
Department department = this.departmentService.getDepartment(departmentId);
+
department.addProjectRole(projectRole);
}
@@ -829,6 +842,33 @@
}
+ /**
+ * �봽濡쒖젥�듃�� �뿰寃곕맂 �씠�뒋�쑀�삎�쓽 �썙�겕�뵆濡쒖슦�뿉�꽌 �꽕�젙�븳 遺��꽌�뒗 �봽濡쒖젥�듃 �떞�떦遺��꽌�뿉�꽌 �젣�쇅 遺덇�
+ * @param project Project
+ * @param departmentIds List<Long>
+ */
+ private void checkDepartmentOfWorkflow(Project project, List<Long> departmentIds) {
+ List<IssueType> issueTypes = this.issueTypeService.findByProjectId(project.getId());
+
+ List<Long> workflowDepartmentIds = Lists.newArrayList();
+
+ if (issueTypes != null && issueTypes.size() > 0) {
+ for (IssueType issueType : issueTypes) {
+ List<WorkflowDepartment> workflowDepartments = this.workflowDepartmentService.find(issueType.getWorkflow().getId());
+ if (workflowDepartments != null && workflowDepartments.size() > 0) {
+ for (WorkflowDepartment workflowDepartment : workflowDepartments) {
+ workflowDepartmentIds.add(workflowDepartment.getDepartment().getId());
+
+ if (!departmentIds.containsAll(workflowDepartmentIds)) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.PROJECT_DEPARTMENT_NOT_EQUAL_WORKFLOW));
+ }
+ }
+ }
+ }
+ }
+ }
+
// �봽濡쒖젥�듃 李몄뿬, �젣�쇅 �넻吏� �젙蹂대�� 以묐났�쑝濡� �굹媛�吏� �븡�룄濡� 泥댄겕�븳�떎.
private void notificationProjectRoleUser(Map<String, Object> changeProjectManagerNotifications, Map<String, Object> changeProjectUserNotifications, Project project) {
List<String> projectManagerExcludeUsers = (List<String>) changeProjectManagerNotifications.get("excludeUsers"); // 愿�由ъ옄 �젣�쇅 �궗�슜�옄
--
Gitblit v1.8.0