전체 이슈 목록 메뉴 추가

이민희

2022-01-07 909a0f1be2fddf26e9639dd189e3e7261040ac12

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

@@ -194,14 +194,21 @@
    @Transactional(readOnly = true)
    public List<IssueTypeCustomFieldVo> findCustomFieldByIssueType(Map<String, Object> resJsonData, IssueTypeCustomFieldCondition condition) {
        List<IssueTypeCustomFieldVo> issueTypeCustomFieldVos = Lists.newArrayList();

        IssueType issueType = this.issueTypeService.getIssueType(condition.getIssueTypeId());
        condition.setIssueTypeId(issueType.getId());
        List<IssueTypeCustomFieldVo> issueTypeCustomFieldVo = Lists.newArrayList();
        condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
        List<IssueTypeCustomFieldVo> issueTypeCustomFieldVo = this.issueTypeCustomFieldMapper.findByIssueType(condition);

        if (condition.getIssueTypeId() != null) {
            IssueType issueType = this.issueTypeService.getIssueType(condition.getIssueTypeId());
            condition.setIssueTypeId(issueType.getId());
            issueTypeCustomFieldVo = this.issueTypeCustomFieldMapper.findByIssueType(condition);
        } else {
            issueTypeCustomFieldVo = this.issueTypeCustomFieldMapper.findByWorkspaceId(condition);
        }

        if (issueTypeCustomFieldVo != null && issueTypeCustomFieldVo.size() > 0) {
            issueTypeCustomFieldVos.addAll(issueTypeCustomFieldVo);
        }

        resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeCustomFieldVos);
        return issueTypeCustomFieldVos;
    }