OWL ITS + 탐지시스템(인터넷 진흥원)
이민희
2022-01-17 709c9fb1f42a70da66ab9b759014b009b1c67d95
충돌 병합
2개 파일 변경됨
11 ■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java 4 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java 7 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -121,9 +121,10 @@
        if (issue != null) {
            StringBuilder sb = new StringBuilder();
            List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
            if (issueHostingFields != null && issueHostingFields.size() > 0) {
                Map<String, Object> param = issueHostingFields.get(0);
                if (issueHostingFields != null && issueHostingFields.size() > 0) {
                IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
                if (issueHosting != null) { //수정 시
@@ -157,6 +158,7 @@
            }
        }
    }
    }
    @Override
    @Transactional(readOnly = true)
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -95,8 +95,10 @@
            IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
            issueIsp.setIspField(ispField);
        }
        return issueIsp;
    }
    /**
     *  이슈 ISP 만들기
@@ -110,6 +112,7 @@
        return CreateIssueIsp(ispFieldForm, issue);
    }
    //  이슈에서 사용되는 업체 값을 업데이트한다.
    @Override
    @Transactional
@@ -117,9 +120,10 @@
        if (issue != null) {
            StringBuilder sb = new StringBuilder();
            List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
            if (issueIspFields != null && issueIspFields.size() > 0) {
                Map<String, Object> param = issueIspFields.get(0);
                if (issueIspFields != null && issueIspFields.size() > 0) {
                IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
                if (issueIsp != null) {//수정 시
@@ -155,6 +159,7 @@
            }
        }
    }
    }
    @Override
    @Transactional(readOnly = true)