Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

wyu

2021-12-20 5d86919587d0f76f26be550c1023628a9d0caa5d

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

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

                if (param != null) {
                if (param != null && param.get("ispId") != null  && param.get("ispId") != "") {
                    IspField ispField = this.ispFieldService.getIsp(MapUtil.getLong(param, "ispId"));

                    Set<IssueIsp> issueIsps = issue.getIssueIspFields();
                    IssueIsp issueIsp = null;
                    IssueIsp issueIsp = new IssueIsp();

                    if (issueIsps != null && issueIsps.size() > 0) {//수정 할 경우
                        issueIsp = issueIsps.iterator().next();
@@ -64,19 +64,24 @@
                        issueIsp.setName(MapUtil.getString(param, "name"));
                        issueIsp.setEmail(MapUtil.getString(param, "email"));
                        issueIsp.setCode(MapUtil.getString(param, "code"));
                        issueIsp.setUrl(MapUtil.getString(param, "url"));
                        issueIsp.setManager(MapUtil.getString(param, "manager"));
                        issueIsp.setTel(MapUtil.getString(param, "tel"));
                        issueIsp.setMemo(MapUtil.getString(param, "memo"));
                    } else  {//추가 할 경우
                        issueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
                        issueIsp.setIssue(issue);
                        issueIsp.setIspField(ispField);
                        if (ispField != null) {
                            issueIsp.setIspField(ispField);
                        }
                        // 추가 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, issueIsp, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    }
                    this.issueIspRepository.saveAndFlush(issueIsp);
                }else {
                    this.issueIspRepository.deleteById(MapUtil.getLong(param, "id"));
                }
            }
        }