test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(测试跟踪): 获取jira模板时优先使用个人信息中的配置

This commit is contained in:
chenjianxing 2022-02-21 11:46:16 +08:00 committed by xiaomeinvG
parent b7144d07b8
commit ac27789576
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
View File

@ -430,6 +430,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
} }
public IssueTemplateDao getThirdPartTemplate() { public IssueTemplateDao getThirdPartTemplate() {
setUserConfig();
Set<String> ignoreSet = new HashSet() {{ Set<String> ignoreSet = new HashSet() {{
add("timetracking"); add("timetracking");
add("attachment"); add("attachment");

8
backend/src/main/java/io/metersphere/track/service/DemandService.java
View File

@ -3,6 +3,7 @@ package io.metersphere.track.service;
import io.metersphere.base.domain.Project; import io.metersphere.base.domain.Project;
import io.metersphere.base.mapper.ProjectMapper; import io.metersphere.base.mapper.ProjectMapper;
import io.metersphere.commons.constants.IssuesManagePlatform; import io.metersphere.commons.constants.IssuesManagePlatform;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.track.dto.DemandDTO; import io.metersphere.track.dto.DemandDTO;
import io.metersphere.track.issue.AbstractIssuePlatform; import io.metersphere.track.issue.AbstractIssuePlatform;
import io.metersphere.track.issue.IssueFactory; import io.metersphere.track.issue.IssueFactory;
@ -67,7 +68,12 @@ public class DemandService {
issueRequest.setProjectId(projectId); issueRequest.setProjectId(projectId);
List<AbstractIssuePlatform> platformList = IssueFactory.createPlatforms(platforms, issueRequest); List<AbstractIssuePlatform> platformList = IssueFactory.createPlatforms(platforms, issueRequest);
platformList.forEach(platform -> { platformList.forEach(platform -> {
List<DemandDTO> demand = platform.getDemandList(projectId); List<DemandDTO> demand = new ArrayList<>();
try {
demand = platform.getDemandList(projectId);
} catch (Exception e) {
LogUtil.error(e);
}
list.addAll(demand); list.addAll(demand);
}); });