From ca9b5f2ca3e6b4d15fc554ba4ce693cecaf0e881 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 24 12월 2021 16:09:36 +0900
Subject: [PATCH] 이슈 추가 시 업체정보 수동입력 가능하도록 하는 기능

---
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index f059be1..5c2d587 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -493,11 +493,11 @@
         //  �떞�떦遺��꽌 吏��젙
         this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
         //  �뾽泥� �젙蹂� ���옣
-        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
+        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);
         //  ISP �젙蹂� ���옣
-        this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
+        this.issueIspService.modifyIssueIspField(issue, issueForm);
         //  HOSTING �젙蹂� ���옣
-        this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
+        this.issueHostingService.modifyIssueHostingField(issue, issueForm);
 
 
         //  泥⑤� �뙆�씪 ���옣
@@ -587,11 +587,11 @@
         //  �떞�떦遺��꽌 吏��젙
         this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
         //  �뾽泥� �젙蹂� ���옣
-        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
+        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);
         //  ISP �젙蹂� ���옣
-        this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
+        this.issueIspService.modifyIssueIspField(issue, issueForm);
         //  HOSTING �젙蹂� ���옣
-        this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
+        this.issueHostingService.modifyIssueHostingField(issue, issueForm);
 
         //  泥⑤� �뙆�씪 ���옣
         //  multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
@@ -664,11 +664,11 @@
         //  �떞�떦遺��꽌 吏��젙
         this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
         //  �뾽泥� �젙蹂� ���옣
-        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
+        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);
         //  ISP �젙蹂� ���옣
-        this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
+        this.issueIspService.modifyIssueIspField(issue, issueForm);
         //  HOSTING �젙蹂� ���옣
-        this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
+        this.issueHostingService.modifyIssueHostingField(issue, issueForm);
 
         //  泥⑤� �뙆�씪 ���옣
         //  multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
@@ -1997,11 +1997,11 @@
         log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));
 
         //  �뾽泥� �젙蹂� ���옣
-        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
+        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);
         //  ISP �젙蹂� ���옣
-        this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
+        this.issueIspService.modifyIssueIspField(issue, issueForm);
         //  HOSTING �젙蹂� ���옣
-        this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
+        this.issueHostingService.modifyIssueHostingField(issue, issueForm);
 
         return issue;
     }
@@ -3230,15 +3230,21 @@
                     break;*/
                 case 6:
                     //  �떞�떦遺��꽌瑜� IssueForm �뿉 ���옣�븳�떎.
-                    this.setIssueFormDepartment(cell, departmentMaps, issueForm, project);
+                    if (cell != null) {
+                        this.setIssueFormDepartment(cell, departmentMaps, issueForm, project);
+                    }
                     break;
                 case 7:
                     //  �떆�옉�씪�쓣 IssueForm �뿉 ���옣�븳�떎.
-                    this.setIssueFormPeriod(cell, issueForm, true, rowIndex);
+                    if (cell != null) {
+                        this.setIssueFormPeriod(cell, issueForm, true, rowIndex);
+                    }
                     break;
                 case 8:
                     //  醫낅즺�씪�쓣 IssueForm �뿉 ���옣�븳�떎.
-                    this.setIssueFormPeriod(cell, issueForm, false, rowIndex);
+                    if (cell != null) {
+                        this.setIssueFormPeriod(cell, issueForm, false, rowIndex);
+                    }
                     break;
                 default:
                     //  9踰� 遺��꽣�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶. �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� IssueForm �뿉 ���옣�븳�떎.
@@ -3442,7 +3448,7 @@
         }
     }
 
-    //  �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� IssueForm �뿉 ���옣�븳�떎.
+    //  �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� IssueForm �뿉 ���옣�븳�떎.-
     private void setIssueFormCustomFieldValue(Cell cell, Map<String, CustomField> customFieldMaps, IssueForm issueForm, String customFieldName, int rowIndex) {
         if (cell != null) {
             String cellValue = CommonUtil.convertExcelStringToCell(cell);

--
Gitblit v1.8.0