From ac27789576a7509f0db0cd08b066fe10ad718ba1 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Mon, 21 Feb 2022 11:46:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96jira=E6=A8=A1=E6=9D=BF=E6=97=B6=E4=BC=98?= =?UTF-8?q?=E5=85=88=E4=BD=BF=E7=94=A8=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/metersphere/track/issue/JiraPlatform.java | 1 + .../java/io/metersphere/track/service/DemandService.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java index 0212c5fb36..0bc7115c3b 100644 --- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java +++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java @@ -430,6 +430,7 @@ public class JiraPlatform extends AbstractIssuePlatform { } public IssueTemplateDao getThirdPartTemplate() { + setUserConfig(); Set ignoreSet = new HashSet() {{ add("timetracking"); add("attachment"); diff --git a/backend/src/main/java/io/metersphere/track/service/DemandService.java b/backend/src/main/java/io/metersphere/track/service/DemandService.java index cd7059799e..77761284ad 100644 --- a/backend/src/main/java/io/metersphere/track/service/DemandService.java +++ b/backend/src/main/java/io/metersphere/track/service/DemandService.java @@ -3,6 +3,7 @@ package io.metersphere.track.service; import io.metersphere.base.domain.Project; import io.metersphere.base.mapper.ProjectMapper; import io.metersphere.commons.constants.IssuesManagePlatform; +import io.metersphere.commons.utils.LogUtil; import io.metersphere.track.dto.DemandDTO; import io.metersphere.track.issue.AbstractIssuePlatform; import io.metersphere.track.issue.IssueFactory; @@ -67,7 +68,12 @@ public class DemandService { issueRequest.setProjectId(projectId); List platformList = IssueFactory.createPlatforms(platforms, issueRequest); platformList.forEach(platform -> { - List demand = platform.getDemandList(projectId); + List demand = new ArrayList<>(); + try { + demand = platform.getDemandList(projectId); + } catch (Exception e) { + LogUtil.error(e); + } list.addAll(demand); });