From b548d49284bc36f5016cba913bb6ac55d8a5e340 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 28 1월 2022 17:40:12 +0900
Subject: [PATCH] 엑셀 임포트 시 코드 수정

---
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java        |    8 ++++----
 src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java |    2 +-
 src/main/webapp/scripts/app/issue/issueImportExcel.controller.js         |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index 7c6ce43..56499a8 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -683,7 +683,7 @@
     }
 
     private void setCompanyFormName(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
-        if (cell == null) {
+        if (!cellNullCheck(cell)) {
             throw new OwlRuntimeException(
                     this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_COMPANY_NAME_IS_NULL, rowIndex));
         }
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 cf3863f..62f8272 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -3583,7 +3583,7 @@
 
     //  �씠�뒋 �젣紐⑹쓣 IssueForm �뿉 ���옣�븳�떎.
     private void setIssueFormTitle(Cell cell, IssueForm issueForm, int rowIndex) {
-        if (cell == null) {
+        if (!cellNullCheck(cell)) {
             throw new OwlRuntimeException(
                     this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISSUE_TITLE_IS_NULL, rowIndex));
         }
@@ -3631,7 +3631,7 @@
 
     //  �슦�꽑�닚�쐞瑜� IssueForm �뿉 ���옣�븳�떎.
     private void setIssueFormPriority(Cell cell, Map<String, Priority> priorityMaps, IssueForm issueForm, int rowIndex) {
-        if (cell == null) {
+        if (!cellNullCheck(cell)) {
             throw new OwlRuntimeException(
                     this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PRIORITY_IS_NULL, rowIndex));
         }
@@ -3648,7 +3648,7 @@
 
     //  以묒슂�룄瑜� IssueForm �뿉 ���옣�븳�떎.
     private void setIssueFormSeverity(Cell cell, Map<String, Severity> severityMaps, IssueForm issueForm, int rowIndex) {
-        if (cell == null) {
+        if (!cellNullCheck(cell)) {
             throw new OwlRuntimeException(
                     this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_SEVERITY_IS_NULL, rowIndex));
         }
@@ -3715,7 +3715,7 @@
 
     //  �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� IssueForm �뿉 ���옣�븳�떎.-
     private void setIssueFormCustomFieldValue(Cell cell, Map<String, CustomField> customFieldMaps, IssueForm issueForm, String customFieldName, int rowIndex) {
-        if (cell != null) {
+        if (!cellNullCheck(cell)) {
             String cellValue = CommonUtil.convertExcelStringToCell(cell);
             Map<String, Object> issueCustomFieldMap = new HashMap<>();
             CustomField customField = customFieldMaps.get(customFieldName);
diff --git a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
index 94f3dcb..b8f88aa 100644
--- a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
@@ -132,7 +132,7 @@
                                 issueTypeId : $scope.vm.form.issueTypeId,
                                 parentIssueId : (function () {
                                     var id = -1;
-                                    if ($scope.vm.form.issues != null) {
+                                    if ($rootScope.isDefined($scope.vm.form.issues)) {
                                         id = $scope.vm.form.issues[0].id
                                     }
                                     return id;

--
Gitblit v1.8.0