From d993a6d7d435769c77163ddd8b844b6a88430a35 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 금, 17 12월 2021 09:00:23 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java index 6f556c6..76e4b96 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java @@ -63,39 +63,42 @@ for (Map<String, Object> map : issueCustomFields) { Map<String, Object> result = new HashMap<>(); // customFieldVo �뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶�� �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� 媛��졇�삩�떎. - this.getCustomFieldAndIssueTypeCustomField(map, issue, result); - List<String> useValues = MapUtil.getStrings(map, "useValues"); + boolean useCustomField = this.getCustomFieldAndIssueTypeCustomField(map, issue, result); + if (useCustomField) { + List<String> useValues = MapUtil.getStrings(map, "useValues"); - if (useValues != null) { - for (String useValue : useValues) { - if (!StringUtils.isEmpty(useValue)) { - // Xss 怨듦꺽 諛⑹뼱瑜� �쐞�빐 script 怨듬갚�쑝濡� 移섑솚 - IssueCustomFieldValue issueCustomFieldValue = new IssueCustomFieldValue(issue, (CustomField)result.get("customField"), (IssueTypeCustomField)result.get("issueTypeCustomField"), useValue); - issueCustomFieldValues.add(issueCustomFieldValue); + if (useValues != null) { + for (String useValue : useValues) { + if (!StringUtils.isEmpty(useValue)) { + // Xss 怨듦꺽 諛⑹뼱瑜� �쐞�빐 script 怨듬갚�쑝濡� 移섑솚 + IssueCustomFieldValue issueCustomFieldValue = new IssueCustomFieldValue(issue, (CustomField) result.get("customField"), (IssueTypeCustomField) result.get("issueTypeCustomField"), useValue); + issueCustomFieldValues.add(issueCustomFieldValue); + } } } } } if (issueCustomFieldValues.size() > 0) { - try { - this.issueCustomFieldValueRepository.saveAll(issueCustomFieldValues); - } catch (Exception ex) { - throw new OwlRuntimeException( - this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_NOT_EXIST)); - } + this.issueCustomFieldValueRepository.saveAll(issueCustomFieldValues); } } // customFieldVo �뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶�� �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� 媛��졇�삩�떎. @Override - public void getCustomFieldAndIssueTypeCustomField(Map<String, Object> map, Issue issue, Map<String, Object> result) { + public boolean getCustomFieldAndIssueTypeCustomField(Map<String, Object> map, Issue issue, Map<String, Object> result) { Map<String, Object> customFieldMap = (Map<String, Object>) MapUtil.getObject(map, "customFieldVo"); CustomField customField = this.customFieldService.getCustomField(MapUtil.getLong(customFieldMap, "id")); IssueTypeCustomField issueTypeCustomField = this.issueTypeCustomFieldService.findByProjectIdAndIssueTypeIdAndCustomFieldId(issue.getProject().getId(), issue.getIssueType().getId(), customField.getId()); + if (issueTypeCustomField == null) { + // �꽕�젙�맂 �궗�슜�옄 �젙�쓽 �븘�뱶媛� �뾾�쓣�븣 + return false; + } result.put("customField", customField); result.put("issueTypeCustomField", issueTypeCustomField); + + return true; } // �씠�뒋�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪쓣 議고쉶�븳�떎. -- Gitblit v1.8.0