- 이메일 보내는 사람 이름 설정 가능하게 수정 - 이슈 엑셀 임포트 시 프로젝트 선택하면 상위이슈 값 초기화 - 엑셀 임포트 시 띄어...

이민희

2022-01-28 490aff099ae78fd76b5e3d6470541f8ce13286ec

- 이메일 보내는 사람 이름 설정 가능하게 수정
- 이슈 엑셀 임포트 시 프로젝트 선택하면 상위이슈 값 초기화
- 엑셀 임포트 시 띄어쓰기 공백 제거

 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) {

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

@@ -3455,6 +3455,9 @@
     * @return boolean
     */
    private Boolean cellNullCheck (Cell cell) {
        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;
    }


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

@@ -78,6 +78,9 @@
    @Value("${email.userName}")
    private String emailUserName;

    @Value("${email.sender}")
    private String emailSender;

    //  이메일 즉시 전송
    @Async
    @Override
@@ -266,7 +269,7 @@
        MimeMessage message = this.javaMailSender.createMimeMessage();

        try {
            InternetAddress from = new InternetAddress(this.emailUserName, "OWL-ITS");
            InternetAddress from = new InternetAddress(this.emailUserName, this.emailSender);
            MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
            messageHelper.setSubject(subject);
            messageHelper.setText(content, true);

 src/main/resources/system_dev.properties

@@ -41,6 +41,7 @@
# email \uC124\uC815
email.host=mail.g2works.kr
email.port=587
email.sender=OWL-ITS
email.userName=supportowl@wisestone.kr
email.password=Stone0620**
email.transport.protocol=smtp

 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.selectedModel) && $scope.selectedModel.length > 0) {
                    if ($rootScope.isDefined($scope.search) && $rootScope.isDefined($scope.selectedModel) && $scope.selectedModel.length > 0) {
                        $scope.open = false;
                        $scope.options = [];
                    }

 src/main/webapp/scripts/app/issue/issueImportExcel.controller.js

@@ -52,6 +52,7 @@

                $scope.$on("projectListEvent", function (event, result) {
                    $scope.vm.form.projects = result;
                    $scope.vm.form.issues = "";
                    $scope.fn.getIssueTypes();
                });


 src/main/webapp/scripts/components/utils/autoComplete.controller.js

@@ -229,7 +229,9 @@
                                if (project.length < 1) {
                                    SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), $filter("translate")("common.selectToProjectListLookUp"), "error"); // "프로젝트를 먼저 선택 해 주세요."
                                }
                                projectIds.push(project[0].id);
                                if ($rootScope.isDefined(project[0])) {
                                    projectIds.push(project[0].id);
                                }
                            }
                            return projectIds;
                        })()