엑셀 임포트 시 코드 수정

이민희

2022-01-28 b548d49284bc36f5016cba913bb6ac55d8a5e340

 src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java

@@ -443,7 +443,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;
    }

    private void telTypeCheck (Cell cell, int rowIndex) {
@@ -492,9 +495,8 @@

                case 4:
                    // 연락처
                    this.telTypeCheck(cell, rowIndex); // 텍스트 형식 체크
                    
                    if (cellNullCheck(cell)) {
                        this.telTypeCheck(cell, rowIndex); // 텍스트 형식 체크
                        this.setCompanyFormTel(cell, companyFieldForm, rowIndex);
                    }
                    break;
@@ -681,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));
        }