From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 17:25:23 +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 | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 4b3be98..4a483e6 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java
@@ -41,10 +41,15 @@
}
@Override
+ public List<CustomFieldApiOverlap> find(Long userId, Long issueTypeId) {
+ return this.customFieldApiOverlapRepository.findByUserIdAndIssueTypeId(userId, issueTypeId);
+ }
+
+ @Override
@Transactional
public void find(Map<String, Object> resJsonData, CustomFieldApiOverlapForm form) {
- UserVo userVo = this.webAppUtil.getLoginUser();
- List<CustomFieldApiOverlap> customFieldApiOverlaps = this.customFieldApiOverlapRepository.findByUserIdAndIssueTypeId(userVo.getId(), 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();
--
Gitblit v1.8.0