From 94bc0a6bad49e818e54a5438a6f202448de05ee0 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 26 1월 2022 15:51:16 +0900
Subject: [PATCH] - 이슈 수정 시 대분류만 선택하고 수정 시 오류 해결 - 전체 댓글 + 메일 보기 / 하위 이슈 댓글 + 메일 보기
---
src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java
index 84bce83..5db4424 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java
@@ -33,6 +33,9 @@
private IssueTypeService issueTypeService;
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private CustomFieldService customFieldService;
@Override
@@ -48,7 +51,8 @@
@Override
@Transactional
public void find(Map<String, Object> resJsonData, CustomFieldApiOverlapForm form) {
- List<CustomFieldApiOverlap> customFieldApiOverlaps = this.find(form.getUserId(), form.getIssueTypeId());
+ Long userId = this.webAppUtil.getLoginId();
+ List<CustomFieldApiOverlap> customFieldApiOverlaps = this.find(userId, form.getIssueTypeId());
if (customFieldApiOverlaps != null && customFieldApiOverlaps.size() > 0) {
List<CustomFieldApiOverlapVo> customFieldApiOverlapVos = Lists.newArrayList();
@@ -71,6 +75,7 @@
@Transactional
public boolean modify(Map<String, Object> resJsonData, CustomFieldApiOverlapForm form) {
User user = this.webAppUtil.getLoginUserObject();
+ Project project = this.projectService.getProject(form.getProjectId());
List<CustomFieldApiOverlap> customFieldApiOverlaps = this.customFieldApiOverlapRepository.findByUserIdAndIssueTypeId(user.getId(), form.getIssueTypeId());
if (customFieldApiOverlaps != null && customFieldApiOverlaps.size() > 0) {
this.customFieldApiOverlapRepository.deleteAll(customFieldApiOverlaps);
@@ -83,6 +88,7 @@
customFieldApiOverlap.setCustomField(customField);
customFieldApiOverlap.setUser(user);
customFieldApiOverlap.setIssueType(this.issueTypeService.getIssueType(form.getIssueTypeId()));
+ customFieldApiOverlap.setProject(project);
customFieldApiOverlapList.add(customFieldApiOverlap);
}
--
Gitblit v1.8.0