|
@@ -184,6 +184,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
// 设置分页参数
|
|
// 设置分页参数
|
|
|
PageHelper.startPage(params.getPage(), params.getPageSize());
|
|
PageHelper.startPage(params.getPage(), params.getPageSize());
|
|
|
List<WaybillOrderSelectVo> list = waybillOrderV1Dao.findListPage(params);
|
|
List<WaybillOrderSelectVo> list = waybillOrderV1Dao.findListPage(params);
|
|
|
|
|
+ PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
|
|
|
|
|
|
|
|
//用户ID
|
|
//用户ID
|
|
|
List<Long> userIds = list.stream().map(WaybillOrderSelectVo::getCreateBy).toList();
|
|
List<Long> userIds = list.stream().map(WaybillOrderSelectVo::getCreateBy).toList();
|
|
@@ -203,7 +204,8 @@ public class KwtWaybillOrderV1Service {
|
|
|
//数据处理
|
|
//数据处理
|
|
|
findNdexPageHandle(waybillOrder);
|
|
findNdexPageHandle(waybillOrder);
|
|
|
}
|
|
}
|
|
|
- return PageHelperUtil.getPageResult(new PageInfo<>(data));
|
|
|
|
|
|
|
+ pageResult.setList(data);
|
|
|
|
|
+ return pageResult;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|