OWL ITS + 탐지시스템(인터넷 진흥원)
이민희
2022-01-17 07f4f6ad9592628ae6e0e77fdd4492b20af098fa
- 버그 수정
4개 파일 변경됨
25 ■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java 7 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java 8 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java 8 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -109,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하기
@@ -176,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());
                }
            }
        }
    }
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -119,12 +119,11 @@
    @Transactional
    public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
        if (issue != null) {
            IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
            StringBuilder sb = new StringBuilder();
            List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
            if (issueHostingFields != null && issueHostingFields.size() > 0) {
                Map<String, Object> param = issueHostingFields.get(0);
                IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
                if (issueHosting != null) { //수정 시
                    // 변경 이력 남기고 issueHosting에 set 해주기
@@ -154,6 +153,11 @@
            } else {
                this.issueHostingRepository.deleteByIssueId(issue.getId());
                this.issueHostingRepository.flush();
                if (issueHosting != null) {
                    issueHistoryService.detectIssueHosting(IssueHistoryType.DELETE, null, null, issueHosting, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                }
            }
        }
    }
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -119,11 +119,10 @@
    public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
        if (issue != null) {
            StringBuilder sb = new StringBuilder();
            IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
            List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
            if (issueIspFields != null && issueIspFields.size() > 0) {
                Map<String, Object> param = issueIspFields.get(0);
                    IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
                    if (issueIsp != null) {//수정 시
                        // 변경 이력 남기고 issueIsp에 set해주기
@@ -155,6 +154,11 @@
            else {
                this.issueIspRepository.deleteByIssueId(issue.getId());
                this.issueIspRepository.flush();
                if (issueIsp != null) {
                    issueHistoryService.detectIssueIsp(IssueHistoryType.DELETE, null, null, issueIsp, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                }
            }
        }
    }
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -520,7 +520,7 @@
                                        // 호스팅
                                        case "USE_HOSTING" :
                                            if (scope.data.ispName !== null) {
                                            if (scope.data.hostingName !== null) {
                                                makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.hostingName + "'></span>";
                                            }else {
                                                makeTag += "<span></span>";