fix: 分页失效问题

mini-app/src/main/java/com/onsiteservice/miniapp/controller/order/ServiceOrderController.java

@@ -63,14 +63,14 @@ public class ServiceOrderController {
     @Dict(code = DictConstants.ORDER_STATUS, name = "orderStatus")
     @ApiOperation(value = "工作台-分页查询订单")
     @PostMapping("page")
-    public Result<PageInfoVO<ServiceOrderVO>> getPage(@RequestBody @NonNull @Validated PageServiceOrderDTO dto, @CurrentUserId Long userId) {
+    public Result<PageInfoVO> getPage(@RequestBody @NonNull @Validated PageServiceOrderDTO dto, @CurrentUserId Long userId) {
         return serviceOrderBizService.getPage(dto, userId);
     }
 
     @Dict(code = DictConstants.ORDER_STATUS, name = "orderStatus")
     @ApiOperation(value = "我的订单-分页查询订单")
     @PostMapping("mine-page")
-    public Result<PageInfoVO<ServiceOrderVO>> getMinePage(@RequestBody @NonNull @Validated PageServiceOrderDTO dto, @CurrentUserId Long userId) {
+    public Result<PageInfoVO> getMinePage(@RequestBody @NonNull @Validated PageServiceOrderDTO dto, @CurrentUserId Long userId) {
         return serviceOrderBizService.getMinePage(dto, userId);
     }
 

mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java

@@ -133,7 +133,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
     }
 
 
-    public Result<PageInfoVO<ServiceOrderVO>> getPage(PageServiceOrderDTO dto, Long userId) {
+    public Result<PageInfoVO> getPage(PageServiceOrderDTO dto, Long userId) {
         log.info("order getPage dto: {}, userId: {}", dto, userId);
 
         User user = userMapper.selectByPrimaryKey(userId);
@@ -154,11 +154,14 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
                 user.getRoleType(),
                 userId);
 
-        return ResultGenerator.success(new PageInfoVO<>(buildServiceOrderVO(serviceOrderList)));
+        PageInfoVO vo = new PageInfoVO(serviceOrderList);
+        vo.setList(buildServiceOrderVO(serviceOrderList));
+
+        return ResultGenerator.success(vo);
     }
 
 
-    public Result<PageInfoVO<ServiceOrderVO>> getMinePage(PageServiceOrderDTO dto, Long userId) {
+    public Result<PageInfoVO> getMinePage(PageServiceOrderDTO dto, Long userId) {
         log.info("order getMinePage dto: {}, userId: {}", dto, userId);
 
         if (!BizConstants.OrderConstants.FRONT_BACK_ORDER_STATUS_MAP.containsKey(dto.getOrderStatus())) {
@@ -172,7 +175,10 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
                 dto.getKeyWord(),
                 userId);
 
-        return ResultGenerator.success(new PageInfoVO<>(buildServiceOrderVO(serviceOrderList)));
+        PageInfoVO vo = new PageInfoVO(serviceOrderList);
+        vo.setList(buildServiceOrderVO(serviceOrderList));
+
+        return ResultGenerator.success(vo);
     }