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

Merge branch 'v1.6' into master

This commit is contained in:
Captain.B 2020-12-22 12:00:29 +08:00
parent f63b20ba2e dcc1df4133
commit 78d8b6708d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/performance/service/ReportService.java
View File

@ -193,11 +193,13 @@ public class ReportService {
public List<LogDetailDTO> getReportLogResource(String reportId) {
List<LogDetailDTO> result = new ArrayList<>();
List<String> resourceIds = extLoadTestReportMapper.selectResourceId(reportId);
resourceIds.forEach(resourceId -> {
List<String> resourceIdAndIndexes = extLoadTestReportMapper.selectResourceId(reportId);
resourceIdAndIndexes.forEach(resourceIdAndIndex -> {
LogDetailDTO detailDTO = new LogDetailDTO();
String[] split = StringUtils.split(resourceIdAndIndex, "_");
String resourceId = split[0];
TestResource testResource = testResourceService.getTestResource(resourceId);
detailDTO.setResourceId(resourceId);
detailDTO.setResourceId(resourceIdAndIndex);
if (testResource == null) {
detailDTO.setResourceName(resourceId);
result.add(detailDTO);