- 이슈 수정 시 대분류만 선택하고 수정 시 오류 해결 - 전체댓글+메일보기/하위이슈 댓글+메일보기 - 이슈 엑셀 임포트시 오류 해결

이민희

2022-01-26 092cba95b42d200799c2d88140fb0f9026176f6d

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

@@ -359,14 +359,14 @@
                            if(useValue.equals(companyFieldVo.getUrl())) {
                                companyField.put("companyId", companyField.get("id"));
                                issueCompanyFields.add(companyField);
                                if(companyFieldVo.getIspId() != null) {
                                if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1) {
                                    Map<String, Object> ispField = this.ispFieldService.find(companyFieldVo.getIspId());
                                    if (ispField != null) {
                                        ispField.put("ispId", ispField.get("id"));
                                        issueIspFields.add(ispField);
                                    }
                                }
                                if(companyFieldVo.getHostingId() != null) {
                                if(companyFieldVo.getHostingId() != null && companyFieldVo.getHostingId() != -1) {
                                    Map<String, Object> hostingField = this.hostingFieldService.find(companyFieldVo.getHostingId());
                                    if (hostingField != null) {
                                        hostingField.put("hostingId", hostingField.get("id"));
@@ -3214,7 +3214,7 @@
                this.issueCompanyRepository.saveAndFlush(issueCompany);

                //  업체의 ISP가 있는 경우 issueISP 등록
                if (companyField.getIspId() != null) {
                if (companyField.getIspId() != null && companyField.getIspId() != -1) {
                    IspField ispField = this.ispFieldService.getIsp(companyField.getIspId());
                    IssueIsp issueIsp = ConvertUtil.copyProperties(ispField, IssueIsp.class);
                    issueIsp.setIspField(ispField);
@@ -3222,7 +3222,7 @@
                    this.issueIspRepository.saveAndFlush(issueIsp);
                }
                //  업체의 호스팅이 있는 경우 issueHosting 등록
                if (companyField.getHostingId() != null) {
                if (companyField.getHostingId() != null && companyField.getHostingId() != -1) {
                    HostingField hostingField = this.hostingFieldService.getHosting(companyField.getHostingId());
                    IssueHosting issueHosting = ConvertUtil.copyProperties(hostingField, IssueHosting.class);
                    issueHosting.setHostingField(hostingField);
@@ -3842,7 +3842,7 @@
    //  이슈를 템플릿에 따라 파트너 담당자에게 메일로 발송한다.
    @Override
    @Transactional(readOnly = true)
    public void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm) {
    public void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> multipartFiles) {
        if (emailTemplateForm.getSendEmails().size() < 1) {
            throw new OwlRuntimeException(
                    this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
@@ -3869,14 +3869,14 @@
        for(int i=0; i < sendMails.length; i++) {
            sendMails[i] = CommonUtil.decryptAES128(sendMails[i]);
        }
        this.systemEmailService.sendEmail(emailTemplateForm.getTitle(), emailTemplateForm.getTemplate(), sendMails, null);
        this.systemEmailService.sendEmail(emailTemplateForm.getTitle(), emailTemplateForm.getTemplate(), sendMails, null, multipartFiles);

        this.issueHistoryService.detectSendIssueMail(IssueHistoryType.SEND, emailTemplateForm.getSendEmails(), sb);
        this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.SEND, sb.toString());
    }

    @Override
    public void sendCommonEmail(EmailCommonForm emailCommonForm) {
    public void sendCommonEmail(EmailCommonForm emailCommonForm, List<MultipartFile> multipartFiles) {
        if (emailCommonForm.getSendEmails().size() < 1) {
            throw new OwlRuntimeException(
                    this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
@@ -3900,7 +3900,7 @@
        for(int i=0; i < sendMails.length; i++) {
            sendMails[i] = CommonUtil.decryptAES128(sendMails[i]);
        }
        this.systemEmailService.sendEmail(emailCommonForm.getTitle(), emailCommonForm.getDescription(), sendMails, null);
        this.systemEmailService.sendEmail(emailCommonForm.getTitle(), emailCommonForm.getDescription(), sendMails, null, multipartFiles);

        if (issue != null) {
            this.issueHistoryService.detectSendIssueMail(IssueHistoryType.SEND, emailCommonForm.getSendEmails(), sb);