From 0078f1017631a29518b4aa6f02b12fb6eb783466 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 19:07:26 +0900
Subject: [PATCH] - 이슈 엑셀 임포트 시 오류 해결 - 이슈 엑셀 임포트 시 상위 이슈 검색시 항목 선택 안되는 문제 해결
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 2 +-
src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js | 2 +-
2 files changed, 2 insertions(+), 2 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 acbd32b..dd99a3d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -3455,7 +3455,7 @@
* @return boolean
*/
private Boolean cellNullCheck (Cell cell) {
- return cell != null && cell.getStringCellValue() != null && cell.getCellType() != Cell.CELL_TYPE_BLANK;
+ return cell != null && cell.getStringCellValue() != null && !cell.getStringCellValue().equals("") && cell.getCellType() != Cell.CELL_TYPE_BLANK;
}
// �뿊�� �븘�뱶�뿉 �엳�뒗 �젙蹂대�� �씠�뒋 form �쑝濡� �삷湲대떎.
diff --git a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
index 322d125..5d5fa69 100644
--- a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
+++ b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
@@ -227,7 +227,7 @@
function toggleDropdown() {
// �븘�씠�뀥�씠 �꽑�깮�릺�뼱 �엳�쓣 寃쎌슦 紐⑸줉 �젅�씠�뼱�뒗 �몴�떆�맆 �닔 �뾾�떎.
$scope.open = true;
- if ($rootScope.isDefined($scope.search)) {
+ if ($rootScope.isDefined($scope.selectedModel) && $scope.selectedModel.length > 0) {
$scope.open = false;
$scope.options = [];
}
--
Gitblit v1.8.0