From 5c686b4f8f380ff6aacb805bdf03d5b6a8d91b52 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 03 12월 2021 14:50:22 +0900
Subject: [PATCH] 사용자정의필드 useFlag 조건 추가
---
src/main/java/kr/wisestone/owl/domain/CustomField.java | 10 +++++++++-
src/main/java/kr/wisestone/owl/repository/CustomFieldRepository.java | 7 ++++---
src/main/java/kr/wisestone/owl/service/impl/CustomFieldServiceImpl.java | 9 +++++----
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/CustomField.java b/src/main/java/kr/wisestone/owl/domain/CustomField.java
index 61cab1d..22884c5 100644
--- a/src/main/java/kr/wisestone/owl/domain/CustomField.java
+++ b/src/main/java/kr/wisestone/owl/domain/CustomField.java
@@ -19,6 +19,7 @@
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String name;
+ private String useFlag;
@Enumerated(EnumType.STRING)
private CustomFieldType customFieldType;
@@ -38,7 +39,6 @@
@OneToMany(mappedBy = "customField", cascade = {CascadeType.ALL}, orphanRemoval = true)
private Set<IssueCustomFieldValue> issueCustomFieldValues = new HashSet<>();
- private String useFlag;
public CustomField() {
}
@@ -110,4 +110,12 @@
public void setIssueCustomFieldValues(Set<IssueCustomFieldValue> issueCustomFieldValues) {
this.issueCustomFieldValues = issueCustomFieldValues;
}
+
+ public String getUseFlag() {
+ return useFlag;
+ }
+
+ public void setUseFlag(String useFlag) {
+ this.useFlag = useFlag;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/repository/CustomFieldRepository.java b/src/main/java/kr/wisestone/owl/repository/CustomFieldRepository.java
index 33ff470..e7afff6 100644
--- a/src/main/java/kr/wisestone/owl/repository/CustomFieldRepository.java
+++ b/src/main/java/kr/wisestone/owl/repository/CustomFieldRepository.java
@@ -7,10 +7,11 @@
public interface CustomFieldRepository extends JpaRepository<CustomField, Long> {
- CustomField findByNameAndWorkspaceId(@Param("name") String name, @Param("workspaceId") Long workspaceId);
+ CustomField findByNameAndWorkspaceIdAndUseFlag(@Param("name") String name, @Param("workspaceId") Long workspaceId, @Param("useFlag") String useFlag);
- CustomField findByNameAndWorkspaceIdAndIdNot(@Param("name") String name, @Param("workspaceId") Long workspaceId, @Param("id") Long id);
+ CustomField findByNameAndWorkspaceIdAndIdNotAndUseFlag(@Param("name") String name, @Param("workspaceId") Long workspaceId, @Param("id") Long id, @Param("useFlag") String useFlag);
List<CustomField> findByWorkspaceId(@Param("workspaceId") Long workspaceId);
-
+
+
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CustomFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CustomFieldServiceImpl.java
index 8bafa4e..4cdf739 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CustomFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CustomFieldServiceImpl.java
@@ -110,12 +110,12 @@
CustomField customField;
Long workspaceId = this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId();
-
+ String useFlag = "Y";
if (id == null) {
- customField = this.customFieldRepository.findByNameAndWorkspaceId(name, workspaceId);
+ customField = this.customFieldRepository.findByNameAndWorkspaceIdAndUseFlag(name, workspaceId, useFlag);
}
else {
- customField = this.customFieldRepository.findByNameAndWorkspaceIdAndIdNot(name, workspaceId, id);
+ customField = this.customFieldRepository.findByNameAndWorkspaceIdAndIdNotAndUseFlag(name, workspaceId, id, useFlag);
}
if (customField != null) {
@@ -342,7 +342,8 @@
@Override
@Transactional(readOnly = true)
public CustomField findByName(String name) {
- return this.customFieldRepository.findByNameAndWorkspaceId(name, this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ String useFlag = "Y";
+ return this.customFieldRepository.findByNameAndWorkspaceIdAndUseFlag(name, this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), useFlag);
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
--
Gitblit v1.8.0