From 9f955be440cad5e6b868800ff0a0acd17c0a3004 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 15:30:35 +0900
Subject: [PATCH] - issue_company 테이블에 컬럼 추가 및 'tel' 컬럼 사이즈 변경 - 이슈 추가,수정 시 업체 추가된 항목들 추가 - 하위이슈 페이징 오류 수정

---
 src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 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 ff3f903..95d5d2b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
@@ -6,9 +6,11 @@
 import kr.wisestone.owl.constant.MsgConstants;
 import kr.wisestone.owl.domain.CompanyField;
 import kr.wisestone.owl.domain.IspField;
+import kr.wisestone.owl.domain.Priority;
 import kr.wisestone.owl.exception.OwlRuntimeException;
 import kr.wisestone.owl.mapper.IspFieldMapper;
 import kr.wisestone.owl.repository.IspFieldRepository;
+import kr.wisestone.owl.service.CompanyFieldService;
 import kr.wisestone.owl.service.IspFieldService;
 import kr.wisestone.owl.service.WorkspaceService;
 import kr.wisestone.owl.util.ConvertUtil;
@@ -24,6 +26,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -46,6 +49,9 @@
     private WorkspaceService workspaceService;
 
     @Autowired
+    private CompanyFieldService companyFieldService;
+
+    @Autowired
     private ExcelView excelView;
 
     @Autowired
@@ -60,12 +66,18 @@
     @Override
     public IspField add(IspFieldForm IspFieldForm) {
         if (IspFieldForm.getTelList() != null && IspFieldForm.getTelList().size() > 0) {
-            String[] tels = ConvertUtil.ToArray(IspFieldForm.getTelList());
-            IspFieldForm.setTel(Arrays.toString(tels));
+            String tels = IspFieldForm.getTelList().toString();
+            if (tels.contains("[")) {
+                tels = tels.substring(1, tels.indexOf("]"));
+            }
+            IspFieldForm.setTel(tels.trim());
         }
         if (IspFieldForm.getEmailList() != null && IspFieldForm.getEmailList().size() > 0) {
-            String[] emails = ConvertUtil.ToArray(IspFieldForm.getEmailList());
-            IspFieldForm.setEmail(Arrays.toString(emails));
+            String emails = IspFieldForm.getEmailList().toString();
+            if (emails.contains("[")) {
+                emails = emails.substring(1, emails.indexOf("]"));
+            }
+            IspFieldForm.setEmail(emails.trim());
         }
 
         IspField ispField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
@@ -111,12 +123,18 @@
     @Override
     public void modify(IspFieldForm IspFieldForm) {
         if (IspFieldForm.getTelList() != null && IspFieldForm.getTelList().size() > 0) {
-            String[] tels = ConvertUtil.ToArray(IspFieldForm.getTelList());
-            IspFieldForm.setTel(Arrays.toString(tels));
+            String tels = IspFieldForm.getTelList().toString();
+            if (tels.contains("[")) {
+                tels = tels.substring(1, tels.indexOf("]"));
+            }
+            IspFieldForm.setTel(tels.trim());
         }
         if (IspFieldForm.getEmailList() != null && IspFieldForm.getEmailList().size() > 0) {
-            String[] emails = ConvertUtil.ToArray(IspFieldForm.getEmailList());
-            IspFieldForm.setEmail(Arrays.toString(emails));
+            String emails = IspFieldForm.getEmailList().toString();
+            if (emails.contains("[")) {
+                emails = emails.substring(1, emails.indexOf("]"));
+            }
+            IspFieldForm.setEmail(emails.trim());
         }
 
         IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
@@ -132,11 +150,23 @@
                     this.messageAccessor.getMessage(MsgConstants.ISP_REMOVE_NOT_SELECT));
         }
         for (Long id : IspFieldForm.getRemoveIds()) {
+            List<CompanyField> companyField = this.companyFieldService.findByIsp(id);
+            if (companyField != null && companyField.size() > 0) {
+                throw new OwlRuntimeException(
+                        this.messageAccessor.getMessage(MsgConstants.ISP_EXIST_COMPANY));
+            } else {
                 this.ispFieldRepository.deleteById(id);
+            }
         }
         this.ispFieldRepository.flush();
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public List<IspField> findAll() {
+        return this.ispFieldRepository.findAll();
+    }
+
     // Isp 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
     @Override
     public ModelAndView downloadExcel(HttpServletRequest request, Model model) {

--
Gitblit v1.8.0