diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java index b6bfe8ad..08fafe9a 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java @@ -98,8 +98,10 @@ public class XmTestCaseController { }else { return Result.error("groupBy-0","分组参数错误"); } - List> datas = xmTestCaseService.getXmTestCaseSort(params); //列出XmTestCase列表 - return Result.ok().setData(datas); + IPage page=QueryTools.initPage(params); + QueryWrapper qw=QueryTools.initQueryWrapper(XmTestCase.class,params); + List> datas = xmTestCaseService.getXmTestCaseSort(page,qw,params); //列出XmTestCase列表 + return Result.ok().setData(datas).setTotal(page.getTotal()); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTestCaseMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTestCaseMapper.java index 09e9e5fd..f7de19c5 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTestCaseMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTestCaseMapper.java @@ -23,6 +23,6 @@ public interface XmTestCaseMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); - List> getXmTestCaseSort(Map xmTestCase); + List> getXmTestCaseSort(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java index 7503358b..01c30588 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java @@ -27,8 +27,8 @@ public class XmTestCaseService extends BaseService public List> selectListMapByWhere(IPage page, QueryWrapper ew, Map ext){ return baseMapper.selectListMapByWhere(page,ew,ext); } - public List> getXmTestCaseSort(Map xmTestCase) { - return baseMapper.getXmTestCaseSort(xmTestCase); + public List> getXmTestCaseSort(IPage page, QueryWrapper ew, Map ext) { + return baseMapper.getXmTestCaseSort(page,ew,ext); } /** 请在此类添加自定义函数 */