From f7c2b16ba76bf372423d619eb2a44564115f0e8c Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 22 11월 2021 13:36:18 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java index 689d42b..de7fd64 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java @@ -46,18 +46,26 @@ Map<String, Object> param = issueIspFields.get(0); if (param != null) { - IssueHosting newIssueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class); - newIssueHosting.setIssue(issue); HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId")); - newIssueHosting.setHostingField(hostingField); Set<IssueHosting> issueHostings = issue.getIssueHostingFields(); - if (issueHostings != null && issueHostings.size() > 0) { - IssueHosting oldIssueHosting = issueHostings.iterator().next(); - ConvertUtil.copyProperties(newIssueHosting, oldIssueHosting); - } + IssueHosting issueHosting = null; - this.issueHostingRepository.saveAndFlush(newIssueHosting); + if (issueHostings != null && issueHostings.size() >0){//�닔�젙 �븷 寃쎌슦 + issueHosting = issueHostings.iterator().next(); + issueHosting.setHostingField(hostingField); + issueHosting.setName(MapUtil.getString(param, "name")); + issueHosting.setEmail(MapUtil.getString(param, "email")); + issueHosting.setCode(MapUtil.getString(param, "code")); + issueHosting.setManager(MapUtil.getString(param, "manager")); + issueHosting.setTel(MapUtil.getString(param, "tel")); + issueHosting.setMemo(MapUtil.getString(param, "memo")); + }else{//異붽� �븷 寃쎌슦 + issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class); + issueHosting.setIssue(issue); + issueHosting.setHostingField(hostingField); + } + this.issueHostingRepository.saveAndFlush(issueHosting); } } } -- Gitblit v1.8.0