- 버그 수정

이민희

2022-01-17 07f4f6ad9592628ae6e0e77fdd4492b20af098fa

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

@@ -71,13 +71,14 @@

        // 사용자가 직접 입력 시 COMPANY 목록에 추가
        if (newIssueCompany.getCompanyField() == null) {
            companyField = this.companyFieldService.addCompany(companyFieldForm);
            newIssueCompany.setCompanyField(companyField);
            IssueCompany oldIssueCompany = this.issueCompanyRepository.findByIssueId(issue.getId());
            companyField = this.companyFieldService.addCompany(companyFieldForm);
            companyFieldForm.setId(companyField.getId());
            if (oldIssueCompany != null) {
                issueHistoryService.detectIssueCompany(IssueHistoryType.MODIFY, null, companyFieldForm, oldIssueCompany, sb);
                this.issueCompanyRepository.deleteById(oldIssueCompany.getId());
            } else {
                newIssueCompany.setCompanyField(companyField);
                issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, null, companyFieldForm, newIssueCompany, sb);
            }
        }
@@ -108,11 +109,11 @@
    public void modifyIssueCompanyField(Issue issue, IssueForm issueForm) {
        if (issue != null) {
            StringBuilder sb = new StringBuilder();
            IssueCompany issueCompany = this.issueCompanyRepository.findByIssueId(issue.getId());
            List<Map<String, Object>> issueCompanyFields = issueForm.getIssueCompanyFields();

            if (issueCompanyFields != null && issueCompanyFields.size() > 0) {
                Map<String, Object> param = issueCompanyFields.get(0);
                IssueCompany issueCompany = this.issueCompanyRepository.findByIssueId(issue.getId());

                if (issueCompany != null) { //수정 시
                    // 변경 이력 먼저 남기고 issueCompany에 set하기
@@ -175,6 +176,11 @@
            } else {
                this.issueCompanyRepository.deleteByIssueId(issue.getId());
                this.issueCompanyRepository.flush();

                if (issueCompany != null) {
                    issueHistoryService.detectIssueCompany(IssueHistoryType.DELETE, null, null, issueCompany, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                }
            }
        }
    }