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

fix(接口测试): 接口测试导出排序方式处理

This commit is contained in:
Jianguo-Genius 2024-09-14 17:19:45 +08:00 committed by 建国
parent a885cbefd5
commit bc0863dd18
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
View File

@ -107,7 +107,7 @@
</if>
<include refid="queryWhereConditionByBaseQueryRequest"/>
<if test="orderColumns != null">
ORDER BY #{orderColumns}
ORDER BY ${orderColumns}
</if>
</select>

3
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionExportService.java
View File

@ -209,7 +209,8 @@ public class ApiDefinitionExportService {
}
if (request.isSelectAll()) {
List<String> ids = extApiDefinitionMapper.getIdsBySort(request, request.getProjectId(), protocols, request.getSortString());
String sortString = StringUtils.isBlank(request.getSortString()) ? "pos desc,id desc" : request.getSortString();
List<String> ids = extApiDefinitionMapper.getIdsBySort(request, request.getProjectId(), protocols, sortString);
if (CollectionUtils.isNotEmpty(request.getExcludeIds())) {
ids.removeAll(request.getExcludeIds());
}