- 이슈상세에서 하위이슈 추가 검색시 상위 이슈는 검색 리스트에서 제외 - 이슈상세에서 연관 이슈/하위 이슈 리스트 전체 불러오기(10...

이민희

2021-12-20 8c9fe9cf7890c0360672b8cd6924c76f11452006

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

@@ -47,7 +47,7 @@
            if (issueCompanyFields != null && issueCompanyFields.size() > 0) {
                Map<String, Object> param = issueCompanyFields.get(0);

                if (param != null) {
                if (param != null && param.get("companyId") != null  && param.get("companyId") != "") {
                    CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId")); //companyId 가져오기

                    Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
@@ -62,20 +62,24 @@
                        issueCompany.setCompanyField(companyField);
                        issueCompany.setName(MapUtil.getString(param, "name"));
                        issueCompany.setEmail(MapUtil.getString(param, "email"));
                        issueCompany.setUrl(MapUtil.getString(param, "url"));
                        issueCompany.setManager(MapUtil.getString(param, "manager"));
                        issueCompany.setTel(MapUtil.getString(param, "tel"));
                        issueCompany.setMemo(MapUtil.getString(param, "memo"));
                    } else  { //추가 할 경우
                        issueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
                        issueCompany.setIssue(issue);
                        issueCompany.setCompanyField(companyField);
                        if (companyField != null) {
                            issueCompany.setCompanyField(companyField);
                        }
                        // 추가 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, param, issueCompany, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    }
                    this.issueCompanyRepository.saveAndFlush(issueCompany);

                } else {
                    this.issueCompanyRepository.deleteById(MapUtil.getLong(param, "id"));
                }
            }
        }