충돌 병합

이민희

2022-01-17 709c9fb1f42a70da66ab9b759014b009b1c67d95

 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)