From 6bd87f2bc7af7361f126451b95dc279b44e9f138 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 22 12월 2021 17:42:16 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 4a483e6..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
@@ -72,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);
@@ -84,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