From 490aff099ae78fd76b5e3d6470541f8ce13286ec Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 28 1월 2022 14:06:40 +0900
Subject: [PATCH] - 이메일 보내는 사람 이름 설정 가능하게 수정 - 이슈 엑셀 임포트 시 프로젝트 선택하면 상위이슈 값 초기화 - 엑셀 임포트 시 띄어쓰기 공백 제거
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 7 +++++--
1 files changed, 5 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..cf3863f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -356,7 +356,7 @@
if(companyFields != null && companyFields.size() > 0) {
for (Map<String, Object> companyField : companyFields) {
CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(companyField, CompanyFieldVo.class);
- if(useValue.equals(companyFieldVo.getUrl())) {
+ if(companyFieldVo.getUrl() != null && useValue.equals(companyFieldVo.getUrl())) {
companyField.put("companyId", companyField.get("id"));
issueCompanyFields.add(companyField);
if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1) {
@@ -3455,7 +3455,10 @@
* @return boolean
*/
private Boolean cellNullCheck (Cell cell) {
- return cell != null && cell.getStringCellValue() != null && cell.getCellType() != Cell.CELL_TYPE_BLANK;
+ if (cell != null && cell.getStringCellValue() != null) {
+ cell.setCellValue(cell.getStringCellValue().trim());//�� 媛� 怨듬갚 �젣嫄�
+ }
+ return cell != null && cell.getStringCellValue() != null && !cell.getStringCellValue().equals("") && cell.getCellType() != Cell.CELL_TYPE_BLANK;
}
// �뿊�� �븘�뱶�뿉 �엳�뒗 �젙蹂대�� �씠�뒋 form �쑝濡� �삷湲대떎.
--
Gitblit v1.8.0