From 9cefc77815ab070cbd6cb410da30307f1df31e34 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 월, 03 1월 2022 10:21:21 +0900 Subject: [PATCH] 검색에서 검색된 이슈를 클릭시 상세화면으로 가는데 x누르면 이전 목록이 보이도록 수정 --- src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java | 38 +++++++++++--------------------------- 1 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java index 110f026..054459d 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java @@ -58,12 +58,13 @@ // Isp 異붽� @Override public IspField add(IspFieldForm IspFieldForm) { - // url �쑀�슚�꽦 泥댄겕 - this.verifyUrl(IspFieldForm.getUrl(), null); - - IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class); - ispFieldRepository.saveAndFlush(IspField); - return IspField; + IspField ispField = ConvertUtil.copyProperties(IspFieldForm, IspField.class); + if (ispField.getCode() != null && !ispField.getCode().equals("")) { + ispFieldRepository.saveAndFlush(ispField); + } else { + throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.ISP_CODE_NOT_ENTER)); + } + return ispField; } // Isp 紐⑸줉�쓣 媛��졇�삩�떎. @@ -79,26 +80,9 @@ return this.convertIspVoToMap(results, totalIspCount, pageable, resJsonData); } - // url �쑀�슚�꽦 泥댄겕 - private void verifyUrl(String url, Long id) { - if (StringUtils.isEmpty(url)) { - throw new OwlRuntimeException( - this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_URL)); - } - IspField ispField; - - if(id == null){ - ispField = this.ispFieldRepository.findByUrl(url); - } else { - ispField = this.ispFieldRepository.findByUrlAndIdNot(url,id); - } - - if (ispField != null) { - throw new OwlRuntimeException( - this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_USED_URL)); - } + public Map<String, Object> find(Long id) { + return this.ispFieldMapper.findById(id); } - // Isp �긽�꽭 議고쉶�븳�떎. @Override @@ -116,8 +100,8 @@ // Isp �젙濡쒕�� �닔�젙�븳�떎. @Override public void modify(IspFieldForm IspFieldForm) { - // url �쑀�슚�꽦 泥댄겕 - this.verifyUrl(IspFieldForm.getUrl(), IspFieldForm.getId()); + if(IspFieldForm.getUrl() != null){ + } IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class); ispFieldRepository.saveAndFlush(IspField); -- Gitblit v1.8.0