From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueApiDefaultServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueApiDefaultServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueApiDefaultServiceImpl.java
index 8df1a36..1c36cd7 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueApiDefaultServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueApiDefaultServiceImpl.java
@@ -46,10 +46,9 @@
@Override
@Transactional
public IssueApiDefault find(Map<String, Object> resJsonData, IssueApiDefaultForm form) {
- UserVo userVo = this.webAppUtil.getLoginUser();
- List<IssueApiDefault> issueApiDefaults = this.issueApiDefaultRepository.findByUserIdAndIssueTypeId(userVo.getId(), form.getIssueTypeId());
- if (issueApiDefaults != null && issueApiDefaults.size() > 0) {
- IssueApiDefault issueApiDefault = issueApiDefaults.get(0);
+ form.setUserId(this.webAppUtil.getLoginId());
+ IssueApiDefault issueApiDefault = this.find(form);
+ if (issueApiDefault != null) {
IssueApiDefaultVo issueApiDefaultVo = ConvertUtil.copyProperties(issueApiDefault, IssueApiDefaultVo.class);
Project project = issueApiDefault.getProject();
if (project != null) {
@@ -67,7 +66,17 @@
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueApiDefaultVo);
- return issueApiDefault;
+ }
+ return issueApiDefault;
+ }
+
+ @Override
+ public IssueApiDefault find(IssueApiDefaultForm form) {
+ if (form.getUserId() != null && form.getIssueTypeId() != null) {
+ List<IssueApiDefault> issueApiDefaults = this.issueApiDefaultRepository.findByUserIdAndIssueTypeId(form.getUserId(), form.getIssueTypeId());
+ if (issueApiDefaults != null && issueApiDefaults.size() > 0) {
+ return issueApiDefaults.get(0);
+ }
}
return null;
}
--
Gitblit v1.8.0