fix(测试计划): 计划列表排序问题

--bug=1041266 --user=宋昌昌 【测试计划】跨页批量归档计划-计划顺序变了 https://www.tapd.cn/55049933/s/1521745
This commit is contained in:
song-cc-rock 2024-05-27 19:16:51 +08:00 committed by Craftsman
parent 01aa4fe633
commit c50243e35c
2 changed files with 3 additions and 1 deletions

View File

@ -18,6 +18,7 @@ import io.metersphere.sdk.util.Translator;
import io.metersphere.system.utils.PageUtils;
import io.metersphere.system.utils.Pager;
import jakarta.annotation.Resource;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -61,7 +62,7 @@ public class TestPlanManagementService {
*/
public Pager<List<TestPlanResponse>> page(TestPlanTableRequest request) {
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(),
StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "t.update_time desc");
MapUtils.isEmpty(request.getSort()) ? "t.num desc" : request.getSortString());
return PageUtils.setPageInfo(page, this.getTableList(request));
}

View File

@ -429,6 +429,7 @@
{
title: 'testPlan.testPlanIndex.createTime',
slotName: 'createTime',
dataIndex: 'createTime',
showInTable: true,
sortable: {
sortDirections: ['ascend', 'descend'],