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/service/impl/CustomFieldServiceImpl.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) 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